X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScreen.py;h=0727f78ba034ae3ef2a3fdd79cd6e681841e74af;hb=db3210090df08c276af7ac14cdfe7b09214a3dbd;hp=d4b3d729e32ac11ceb2de790d7d40a291c2429d1;hpb=9a0d02d2e74c24dcc7b8bfe6df937e92c8af1d0d;p=vuplus_dvbapp

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index d4b3d72..0727f78 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,5 +1,6 @@
 from Components.HTMLSkin import *
 from Components.GUISkin import *
+from Components.Sources.Source import Source
 
 import sys
 
@@ -35,7 +36,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 +65,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,8 +99,8 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.instance.show()
 		for x in self.onShow:
 			x()
-		for (name, val) in self.items():
-			if isinstance(val, GUIComponent):
+		for val in self.values() + self.renderer:
+			if isinstance(val, GUIComponent) or isinstance(val, Source):
 				val.onShow()
 
 	def hide(self):
@@ -97,6 +110,9 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.instance.hide()
 		for x in self.onHide:
 			x()
-		for (name, val) in self.items():
-			if isinstance(val, GUIComponent):
+		for val in self.values() + self.renderer:
+			if isinstance(val, GUIComponent) or isinstance(val, Source):
 				val.onHide()
+
+	def __repr__(self):
+		return str(type(self))