X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c96458e835dbd5771729b6f281dc7a89283a5b3a..bb2800462a81afbcfce36fa15d90808d13eae55b:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 585f15cf..7ac7841c 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,10 +1,15 @@
-from Components.HTMLSkin import HTMLSkin
+from Tools.Profile import profile
+
+profile("LOAD:GUISkin")
 from Components.GUISkin import GUISkin
+profile("LOAD:Source")
 from Components.Sources.Source import Source
+profile("LOAD:GUIComponent")
 from Components.GUIComponent import GUIComponent
 
-class Screen(dict, HTMLSkin, GUISkin):
+class Screen(dict, GUISkin):
 
+	False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3)
 	ALLOW_SUSPEND = False
 
 	global_screen = None
@@ -71,10 +76,11 @@ class Screen(dict, HTMLSkin, 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
@@ -94,18 +100,15 @@ class Screen(dict, HTMLSkin, 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()