Screen.py: add missing dict.__init__ call

[vuplus_dvbapp] / lib / python / Screens / Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index ba96ef5..f0bf773 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,15 +1,21 @@
-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
 
        def __init__(self, session, parent = None):
+               dict.__init__(self)
                self.skinName = self.__class__.__name__
                self.session = session
                self.parent = parent
@@ -47,7 +53,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 = []
@@ -71,10 +77,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 +101,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()