Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master

[enigma2.git] / lib / python / Components / Converter / StringList.py

diff --git a/lib/python/Components/Converter/StringList.py b/lib/python/Components/Converter/StringList.py
index 4199212a33f348bbe1494a95500e7adea357b464..acbba3443ccaca4f868b2cc19b2dc7db70f6f0e1 100644 (file)
--- a/lib/python/Components/Converter/StringList.py
+++ b/lib/python/Components/Converter/StringList.py
@@ -25,7 +25,7 @@ class StringList(Converter):
 
        @cached
        def getCurrent(self):
-               if self.source is None:
+               if self.source is None or self.index is None or self.index >= len(self.source.list):
                        return None
                return self.source.list[self.index]
 
@@ -41,5 +41,8 @@ class StringList(Converter):
        def setIndex(self, index):
                if self.master is not None:
                        self.master.index = index
-       
+
        index = property(getIndex, setIndex)
+
+       def entry_changed(self, index):
+               self.downstream_elements.entry_changed(index)