revert non working
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 23 Nov 2007 18:56:01 +0000 (18:56 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 23 Nov 2007 18:56:01 +0000 (18:56 +0000)
lib/python/Screens/Screen.py

index 92efb7053b7e209e7fc5c4b92af9174c7e5ae51b..585f15cf02e8f473484254724b4602209e4ad68a 100644 (file)
@@ -37,8 +37,6 @@ class Screen(dict, HTMLSkin, GUISkin):
 
                self.close_on_next_exec = None
 
 
                self.close_on_next_exec = None
 
-               self.in_close = False
-
                # stand alone screens (for example web screens)
                # don't care about having or not having focus.
                self.stand_alone = False
                # stand alone screens (for example web screens)
                # don't care about having or not having focus.
                self.stand_alone = False
@@ -112,12 +110,10 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.__dict__.clear()
        
        def close(self, *retval):
                self.__dict__.clear()
        
        def close(self, *retval):
-               if not self.in_close:
-                       if not self.execing:
-                               self.close_on_next_exec = retval
-                       else:
-                               self.in_close = True
-                               self.session.close(self, *retval)
+               if not self.execing:
+                       self.close_on_next_exec = retval
+               else:
+                       self.session.close(self, *retval)
 
        def setFocus(self, o):
                self.instance.setFocus(o.instance)
 
        def setFocus(self, o):
                self.instance.setFocus(o.instance)