verify that ConfigList entries are ConfigElements

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

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index dc10045caa58af1487283680bf139143cde97650..c93b10f703e5ac4f2491daad2002875277dd9a0f 100644 (file)
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -1,6 +1,6 @@
 from HTMLComponent import *
 from GUIComponent import *
-from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT
+from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT, ConfigElement
 from Components.ActionMap import NumberActionMap
 from enigma import eListbox, eListboxPythonConfigContent, eTimer
 
@@ -70,10 +70,14 @@ class ConfigList(HTMLComponent, GUIComponent, object):
        def preWidgetRemove(self, instance):
                instance.selectionChanged.get().remove(self.selectionChanged)
        
-       def setList(self, list):
-               self.__list = list
+       def setList(self, l):
+               self.__list = l
                self.l.setList(self.__list)
 
+               if l is not None:
+                       for x in l:
+                               assert isinstance(x[1], ConfigElement), "entry in ConfigList " + str(x[1]) + " must be a ConfigElement"
+
        def getList(self):
                return self.__list
 
@@ -101,7 +105,7 @@ class ConfigListScreen:
                        "9": self.keyNumberGlobal,
                        "0": self.keyNumberGlobal
                }, -1) # to prevent left/right overriding the listbox
-
+               
                self["config"] = ConfigList(list, session = session)
 
        def keyOK(self):