aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/Screen.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 92efb705..585f15cf 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -37,8 +37,6 @@ class Screen(dict, HTMLSkin, GUISkin):
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
@@ -112,12 +110,10 @@ class Screen(dict, HTMLSkin, GUISkin):
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)