X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9d3112aad388b4369a339b851aa2507a02bb2d4f..5e0d91a196bfe872d04d676e5f6c2d5940786be0:/lib/python/Components/Converter/StringList.py

diff --git a/lib/python/Components/Converter/StringList.py b/lib/python/Components/Converter/StringList.py
index 1304c643..5d02e9ba 100644
--- a/lib/python/Components/Converter/StringList.py
+++ b/lib/python/Components/Converter/StringList.py
@@ -6,9 +6,12 @@ class StringList(Converter):
 	"""Turns a simple python list into a list which can be used in a listbox."""
 	def __init__(self, type):
 		Converter.__init__(self, type)
+		self.content = None
 
 	def changed(self, what):
-		self.content = eListboxPythonStringContent()
+		if not self.content:
+			self.content = eListboxPythonStringContent()
+
 		if self.source:
 			self.content.setList(self.source.list)
 		self.downstream_elements.changed(what)
@@ -22,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]
 
@@ -38,5 +41,5 @@ class StringList(Converter):
 	def setIndex(self, index):
 		if self.master is not None:
 			self.master.index = index
-	
+
 	index = property(getIndex, setIndex)