X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScreen.py;h=f0bf773d6a28a76418984bbad84811eba4835766;hp=4c4f117bad39c213775077ac8d6c58a7863277fd;hb=0a62b65175152c42976d4cb04fb7026d9f910915;hpb=5274c69abf4cb2b99ab9d92ac0081c0ec49bd2e4

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 4c4f117..f0bf773 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,4 +1,4 @@
-from Tools.Profile import profile, profile_final
+from Tools.Profile import profile
 
 profile("LOAD:GUISkin")
 from Components.GUISkin import GUISkin
@@ -9,11 +9,13 @@ from Components.GUIComponent import GUIComponent
 
 class Screen(dict, GUISkin):
 
+	False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3)
 	ALLOW_SUSPEND = False
 
 	global_screen = None
 
 	def __init__(self, session, parent = None):
+		dict.__init__(self)
 		self.skinName = self.__class__.__name__
 		self.session = session
 		self.parent = parent
@@ -75,10 +77,11 @@ class Screen(dict, GUISkin):
 				x()
 	
 	def execEnd(self):
+		active_components = self.active_components
 #		for (name, val) in self.items():
-		for val in self.active_components:
+		self.active_components = None
+		for val in active_components:
 			val.execEnd()
-		del self.active_components
 #		assert self.session != None, "execEnd on non-execing screen!"
 #		self.session = None
 		self.execing = False
@@ -98,18 +101,15 @@ class Screen(dict, GUISkin):
 		# but currently we destroy the screen afterwards
 		# anyway.
 		for val in self.renderer:
-			val.disconnectAll()  # disconnected converter/sources and probably destroy them
-		
+			val.disconnectAll()  # disconnected converter/sources and probably destroy them. Sources will not be destroyed.
+
 		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()