aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorFraxinas <andreas.frisch@multimedia-labs.de>2011-02-23 14:13:42 +0100
committerFraxinas <andreas.frisch@multimedia-labs.de>2011-02-23 14:13:42 +0100
commitd15066ea9f5412d83fb46db2974ef08646d86634 (patch)
treed4dc4086e60002c17d55f4904b77a6f88ebc1800 /lib/python/Screens
parent102118bc5545165bb9323c5a1f053778821e8f5f (diff)
parentb4053026b1af27eee25d483cfdc33d91678479bd (diff)
downloadenigma2-d15066ea9f5412d83fb46db2974ef08646d86634.tar.gz
enigma2-d15066ea9f5412d83fb46db2974ef08646d86634.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/Standby.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 1a7ebbd1..94a56ee4 100644
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -160,14 +160,9 @@ class TryQuitMainloop(MessageBox):
self.conntected=False
self.session.nav.record_event.remove(self.getRecordEvent)
if value:
- # hack .. we dont like to show any other screens when this screen has closed
- self.onClose = [self.__closed]
- self.session.dialog_stack = []
- self.session.summary_stack = [None]
- MessageBox.close(self, True)
-
- def __closed(self):
- quitMainloop(self.retval)
+ quitMainloop(self.retval)
+ else:
+ MessageBox.close(self, True)
def __onShow(self):
global inTryQuitMainloop