Merge branch 'master' into experimental

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

diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py
index 607858026d17d399ca7e2d9355bd5e07492f033a..418a1b67e0a6981c40189d4f830c945a5417ca11 100755 (executable)
--- a/lib/python/Components/ConfigList.py
+++ b/lib/python/Components/ConfigList.py
@@ -146,15 +146,20 @@ class ConfigListScreen:
                        self["config"].onSelectionChanged.append(self.handleInputHelpers)
 
        def handleInputHelpers(self):
-               if isinstance(self["config"].getCurrent()[1], ConfigText) or isinstance(self["config"].getCurrent()[1], ConfigPassword):
-                       if self.has_key("VKeyIcon"):
-                               self["VirtualKB"].setEnabled(True)
-                               self["VKeyIcon"].boolean = True
-                       if self.has_key("HelpWindow"):
-                               if self["config"].getCurrent()[1].help_window.instance is not None:
-                                       helpwindowpos = self["HelpWindow"].getPosition()
-                                       from enigma import ePoint
-                                       self["config"].getCurrent()[1].help_window.instance.move(ePoint(helpwindowpos[0],helpwindowpos[1]))
+               if self["config"].getCurrent() is not None:
+                       if isinstance(self["config"].getCurrent()[1], ConfigText) or isinstance(self["config"].getCurrent()[1], ConfigPassword):
+                               if self.has_key("VKeyIcon"):
+                                       self["VirtualKB"].setEnabled(True)
+                                       self["VKeyIcon"].boolean = True
+                               if self.has_key("HelpWindow"):
+                                       if self["config"].getCurrent()[1].help_window.instance is not None:
+                                               helpwindowpos = self["HelpWindow"].getPosition()
+                                               from enigma import ePoint
+                                               self["config"].getCurrent()[1].help_window.instance.move(ePoint(helpwindowpos[0],helpwindowpos[1]))
+                       else:
+                               if self.has_key("VKeyIcon"):
+                                       self["VirtualKB"].setEnabled(False)
+                                       self["VKeyIcon"].boolean = False
                else:
                        if self.has_key("VKeyIcon"):
                                self["VirtualKB"].setEnabled(False)