X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5274c69abf4cb2b99ab9d92ac0081c0ec49bd2e4..bb2800462a81afbcfce36fa15d90808d13eae55b:/lib/python/Screens/Screen.py diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py index 4c4f117b..7ac7841c 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,6 +9,7 @@ from Components.GUIComponent import GUIComponent class Screen(dict, GUISkin): + False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3) ALLOW_SUSPEND = False global_screen = None @@ -75,10 +76,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 +100,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()