X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/77abca3d696169b041aa482f876f2bf2775c25d7..efc5aca651306518e6f21a6bd7cbfa1928821b60:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index ba96ef50..508309db 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,9 +1,13 @@
-from Components.HTMLSkin import HTMLSkin
+from Tools.Profile import profile, profile_final
+
+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):
 
 	ALLOW_SUSPEND = False
 
@@ -47,7 +51,7 @@ class Screen(dict, HTMLSkin, GUISkin):
 			tmp = self.close_on_next_exec
 			self.close_on_next_exec = None
 			self.execing = True
-			self.close(tmp)
+			self.close(*tmp)
 		else:
 			single = self.onFirstExecBegin
 			self.onFirstExecBegin = []
@@ -94,18 +98,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()