add disconnect to elements, and disconnect renderer from sources on screen close

[enigma2.git] / lib / python / Screens / Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 8398dadd0fb17169c3828173d4bd29691452725c..5f1cf6d610193b848db2aba773613a11ff83ce87 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -35,7 +35,7 @@ class Screen(dict, HTMLSkin, GUISkin):
 #              assert self.session == None, "a screen can only exec once per time"
 #              self.session = session
 
-               for (name, val) in self.items():
+               for val in self.values() + self.renderer:
                        val.execBegin()
                        if self.session.current_dialog != self:
                                return
@@ -64,16 +64,29 @@ 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():
+                       val.destroy()
                        del self[name]
                
+               for val in self.renderer:
+                       val.destroy()
+               
+               self.renderer = [ ]
+               
                # really delete all elements now
                self.__dict__.clear()
        
        def close(self, *retval):
-               self.session.close(*retval)
+               self.session.close(self, *retval)
 
        def setFocus(self, o):
                self.instance.setFocus(o.instance)
@@ -85,7 +98,7 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.instance.show()
                for x in self.onShow:
                        x()
-               for (name, val) in self.items():
+               for val in self.values() + self.renderer:
                        if isinstance(val, GUIComponent):
                                val.onShow()
 
@@ -96,6 +109,6 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.instance.hide()
                for x in self.onHide:
                        x()
-               for (name, val) in self.items():
+               for val in self.values() + self.renderer:
                        if isinstance(val, GUIComponent):
                                val.onHide()