X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9a0d02d2e74c24dcc7b8bfe6df937e92c8af1d0d..954106887a9b77a26753c5613ff368ce4c997044:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index d4b3d729..5f1cf6d6 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -35,7 +35,7 @@ class Screen(dict, HTMLSkin, GUISkin):
 #		assert self.session == None, "a screen can only exec once per time"
 #		self.session = session
 
-		for (name, val) in self.items():
+		for val in self.values() + self.renderer:
 			val.execBegin()
 			if self.session.current_dialog != self:
 				return
@@ -64,17 +64,29 @@ class Screen(dict, HTMLSkin, GUISkin):
 		# fixup circular references
 		del self.helpList
 		GUISkin.close(self)
+
+		# first disconnect all render from their sources.
+		# we might split this out into a "unskin"-call,
+		# but currently we destroy the screen afterwards
+		# anyway.
+		for val in self.renderer:
+			val.disconnectAll()  # disconnected converter/sources and probably destroy them
 		
 		del self.session
 		for (name, val) in self.items():
 			val.destroy()
 			del self[name]
 		
+		for val in self.renderer:
+			val.destroy()
+		
+		self.renderer = [ ]
+		
 		# really delete all elements now
 		self.__dict__.clear()
 	
 	def close(self, *retval):
-		self.session.close(*retval)
+		self.session.close(self, *retval)
 
 	def setFocus(self, o):
 		self.instance.setFocus(o.instance)
@@ -86,7 +98,7 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.instance.show()
 		for x in self.onShow:
 			x()
-		for (name, val) in self.items():
+		for val in self.values() + self.renderer:
 			if isinstance(val, GUIComponent):
 				val.onShow()
 
@@ -97,6 +109,6 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.instance.hide()
 		for x in self.onHide:
 			x()
-		for (name, val) in self.items():
+		for val in self.values() + self.renderer:
 			if isinstance(val, GUIComponent):
 				val.onHide()