Merge branch 'obi/master'

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

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index 418a1b67e0a6981c40189d4f830c945a5417ca11..24f917f76398c109e1f1000914248296fdfcaf06 100755 (executable)
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -61,12 +61,13 @@ class ConfigList(HTMLComponent, GUIComponent, object):
        GUI_WIDGET = eListbox
        
        def selectionChanged(self):
        GUI_WIDGET = eListbox
        
        def selectionChanged(self):

-               if self.current:
+               if isinstance(self.current,tuple) and len(self.current) == 2:

                        self.current[1].onDeselect(self.session)
                self.current = self.getCurrent()
                        self.current[1].onDeselect(self.session)
                self.current = self.getCurrent()

-               if self.current:
+               if isinstance(self.current,tuple) and len(self.current) == 2:

                        self.current[1].onSelect(self.session)
                        self.current[1].onSelect(self.session)

-
+               else:
+                       return

                for x in self.onSelectionChanged:
                        x()
 
                for x in self.onSelectionChanged:
                        x()
 


@@ -75,11 +76,11 @@ class ConfigList(HTMLComponent, GUIComponent, object):
                instance.setContent(self.l)
        
        def preWidgetRemove(self, instance):
                instance.setContent(self.l)
        
        def preWidgetRemove(self, instance):

-               if self.current:
+               if isinstance(self.current,tuple) and len(self.current) == 2:

                        self.current[1].onDeselect(self.session)
                instance.selectionChanged.get().remove(self.selectionChanged)
                instance.setContent(None)
                        self.current[1].onDeselect(self.session)
                instance.selectionChanged.get().remove(self.selectionChanged)
                instance.setContent(None)

-       
+

        def setList(self, l):
                self.timer.stop()
                self.__list = l
        def setList(self, l):
                self.timer.stop()
                self.__list = l


@@ -87,7 +88,7 @@ class ConfigList(HTMLComponent, GUIComponent, object):
 
                if l is not None:
                        for x in l:
 
                if l is not None:
                        for x in l:

-                               assert isinstance(x[1], ConfigElement), "entry in ConfigList " + str(x[1]) + " must be a ConfigElement"
+                               assert len(x) < 2 or isinstance(x[1], ConfigElement), "entry in ConfigList " + str(x[1]) + " must be a ConfigElement"

 
        def getList(self):
                return self.__list
 
        def getList(self):
                return self.__list