X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/36dc37e5d0c9ef8fc5f923ad38ee6cc98f316556..cffee89d7b3567ee92901f6963108c33ea3ac469:/lib/python/Screens/Screen.py diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py index bbc6b1ec..b581e62b 100644 --- a/lib/python/Screens/Screen.py +++ b/lib/python/Screens/Screen.py @@ -1,10 +1,12 @@ from Components.HTMLSkin import * from Components.GUISkin import * +from Components.Sources.Source import Source import sys class Screen(dict, HTMLSkin, GUISkin): - """ bla """ + + ALLOW_SUSPEND = False def __init__(self, session): self.skinName = self.__class__.__name__ @@ -64,6 +66,13 @@ class Screen(dict, HTMLSkin, GUISkin): # fixup circular references del self.helpList GUISkin.close(self) + + # first disconnect all render from their sources. + # we might split this out into a "unskin"-call, + # but currently we destroy the screen afterwards + # anyway. + for val in self.renderer: + val.disconnectAll() # disconnected converter/sources and probably destroy them del self.session for (name, val) in self.items(): @@ -92,7 +101,7 @@ class Screen(dict, HTMLSkin, GUISkin): for x in self.onShow: x() for val in self.values() + self.renderer: - if isinstance(val, GUIComponent): + if isinstance(val, GUIComponent) or isinstance(val, Source): val.onShow() def hide(self): @@ -103,5 +112,8 @@ class Screen(dict, HTMLSkin, GUISkin): for x in self.onHide: x() for val in self.values() + self.renderer: - if isinstance(val, GUIComponent): + if isinstance(val, GUIComponent) or isinstance(val, Source): val.onHide() + + def __repr__(self): + return str(type(self))