be a little more careful with the config lists (fixes a crash in the wizard)
authorMoritz Venn <ritzmo@users.schwerkraft.elitedvb.net>
Mon, 4 Aug 2008 16:32:03 +0000 (16:32 +0000)
committerMoritz Venn <ritzmo@users.schwerkraft.elitedvb.net>
Mon, 4 Aug 2008 16:32:03 +0000 (16:32 +0000)
autotimer/src/AutoTimerEditor.py
autotimer/src/AutoTimerWizard.py

index 7f6f8d4..b238f93 100644 (file)
@@ -645,7 +645,7 @@ class AutoTimerFilterEditor(Screen, ConfigListScreen):
                # Warning, accessing a ConfigListEntry directly might be considered evil!
 
                idx = -1
-               for item in self["config"].getList():
+               for item in self["config"].getList()[:]:
                        idx += 1
                        # Skip empty entries (and those which are no filters)
                        if item[1].value == "" or idx < 2:
@@ -754,7 +754,7 @@ class AutoTimerFilterEditor(Screen, ConfigListScreen):
                        self.close(None)
 
        def save(self):
-               self.saveCurrent()
+               self.refresh()
 
                self.close((
                        self.enabled.value,
@@ -822,7 +822,7 @@ class AutoTimerServiceEditor(Screen, ConfigListScreen):
                
                # Warning, accessing a ConfigListEntry directly might be considered evil!
 
-               myl = self["config"].getList()
+               myl = self["config"].getList()[:]
                myl.pop(0) # Enabled
                myl.pop(0) # Type
                for item in myl:
@@ -915,7 +915,7 @@ class AutoTimerServiceEditor(Screen, ConfigListScreen):
                        self.close(None)
 
        def save(self):
-               self.saveCurrent()
+               self.refresh()
 
                self.close((
                        self.enabled.value,
index 8c39b4f..1631ed0 100755 (executable)
@@ -124,7 +124,7 @@ class AutoTimerWizard(WizardLanguage, AutoTimerEditorBase, Rc):
                        else:
                                self.timer.timespan = None
                elif self.currStep == AutoTimerWizard.STEP_ID_SERVICES: # Services
-                       self.servicesDlg.saveCurrent()
+                       self.servicesDlg.refresh()
 
                        if self.servicesDlg.enabled.value:
                                self.timer.services = self.servicesDlg.services[0]
@@ -133,7 +133,7 @@ class AutoTimerWizard(WizardLanguage, AutoTimerEditorBase, Rc):
                                self.timer.services = []
                                self.timer.bouquets = []
                elif self.currStep == AutoTimerWizard.STEP_ID_FILTER: # Filters
-                       self.filterDlg.saveCurrent()
+                       self.filterDlg.refresh()
 
                        if self.filterDlg.enabled.value:
                                self.timer.includes = self.filterDlg.includes