ignore requests to invalidate non-existing entries

[enigma2.git] / lib / python / Components / ConfigList.py

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index e3ef6f12f63083a8b2d82d3b6f3cc24a091ad5a6..4dd401f9475a0e0c5b3da27f6f82add44a5d330e 100644 (file)
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -10,15 +10,17 @@ class ConfigList(HTMLComponent, GUIComponent, object):
                self.l = eListboxPythonConfigContent()
                self.l.setSeperation(100)
                self.timer = eTimer()
-               self.timer.timeout.get().append(self.timeout)
                self.list = list
                self.onSelectionChanged = [ ]
                self.current = None
                self.help_window = None
                self.setHelpWindowSession(session)
 
+       def execBegin(self):
+               self.timer.timeout.get().append(self.timeout)
+
        def execEnd(self):
-               self.timer = None
+               self.timer.timeout.get().remove(self.timeout)
 
        def setHelpWindowSession(self, session):
                assert self.help_window is None, "you can't move a help window to another session"
@@ -44,9 +46,12 @@ class ConfigList(HTMLComponent, GUIComponent, object):
        
        def invalidateCurrent(self):
                self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
-               
+
        def invalidate(self, entry):
-               self.l.invalidateEntry(self.__list.index(entry))
+               # when the entry to invalidate does not exist, just ignore the request.
+               # this eases up conditional setup screens a lot.
+               if entry in self.__list:
+                       self.l.invalidateEntry(self.__list.index(entry))
 
        GUI_WIDGET = eListbox
        
@@ -90,7 +95,7 @@ class ConfigList(HTMLComponent, GUIComponent, object):
                self.handleKey(KEY_TIMEOUT)
 
 class ConfigListScreen:
-       def __init__(self, list, session = None):
+       def __init__(self, list, session = None, on_change = None):
                self["config_actions"] = NumberActionMap(["SetupActions", "TextInputActions"],
                {
                        "ok": self.keyOK,
@@ -110,18 +115,27 @@ class ConfigListScreen:
                }, -1) # to prevent left/right overriding the listbox
                
                self["config"] = ConfigList(list, session = session)
+               if on_change is not None:
+                       self.__changed = on_change
+               else:
+                       self.__changed = lambda: None
 
        def keyOK(self):
                self["config"].handleKey(KEY_OK)
 
        def keyLeft(self):
                self["config"].handleKey(KEY_LEFT)
+               self.__changed()
 
        def keyRight(self):
                self["config"].handleKey(KEY_RIGHT)
+               self.__changed()
 
        def keyDelete(self):
                self["config"].handleKey(KEY_DELETE)
+               self.__changed()
 
        def keyNumberGlobal(self, number):
                self["config"].handleKey(KEY_0 + number)
+               self.__changed()
+