return None (instead of crash) when list is empty, and getCurrent is called

[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..5d02e9bad269178c07dd374c77b8b54d23a075a1 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 >= len(self.source.list):
                        return None
                return self.source.list[self.index]
 
@@ -41,5 +41,5 @@ class StringList(Converter):
        def setIndex(self, index):
                if self.master is not None:
                        self.master.index = index
-       
+
        index = property(getIndex, setIndex)