X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/67b53c1cb06988394c35a6e965c99b72b67fe1be..269c1d980e92fa79d72c19b0a51db16240b2649d:/lib/python/Components/Renderer/Listbox.py

diff --git a/lib/python/Components/Renderer/Listbox.py b/lib/python/Components/Renderer/Listbox.py
index ef8206af..7a895330 100644
--- a/lib/python/Components/Renderer/Listbox.py
+++ b/lib/python/Components/Renderer/Listbox.py
@@ -39,6 +39,10 @@ class Listbox(Renderer, object):
 		self.wrap_around = self.wrap_around # trigger
 		self.selection_enabled = self.selection_enabled # trigger
 
+	def preWidgetRemove(self, instance):
+		instance.setContent(None)
+		instance.selectionChanged.get().remove(self.selectionChanged)
+
 	def setWrapAround(self, wrap_around):
 		self.__wrap_around = wrap_around
 		if self.instance is not None:
@@ -51,7 +55,7 @@ class Listbox(Renderer, object):
 
 	def getIndex(self):
 		if self.instance is None:
-			return None
+			return 0
 		return self.instance.getCurrentIndex()
 
 	def moveToIndex(self, index):
@@ -74,3 +78,7 @@ class Listbox(Renderer, object):
 
 	def changed(self, what):
 		self.content = self.source.content
+
+	def entry_changed(self, index):
+		if self.instance is not None:
+			self.instance.entryChanged(index)