Merge branch 'obi/master'

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

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 406b87cbfe0dd3b765cdb40efdc8f57130746ad8..94a56ee44da0d6993ce8b7c7b89930c1cbd6b9f1 100644 (file)
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -3,6 +3,7 @@ from Components.ActionMap import ActionMap
 from Components.config import config
 from Components.AVSwitch import AVSwitch
 from Components.SystemInfo import SystemInfo
+from GlobalActions import globalActionMap
 from enigma import eDVBVolumecontrol
 
 inStandby = None
@@ -41,6 +42,8 @@ class Standby(Screen):
                        "power": self.Power
                }, -1)
 
+               globalActionMap.setEnabled(False)
+
                #mute adc
                self.setMute()
 
@@ -72,6 +75,7 @@ class Standby(Screen):
                elif self.paused_service:
                        self.paused_service.unPauseService()
                self.session.screen["Standby"].boolean = False
+               globalActionMap.setEnabled(True)
 
        def __onFirstExecBegin(self):
                global inStandby
@@ -156,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