Merge branch 'bug_538_ignore_global_actions_in_standby'

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 406b87c..1a7ebbd 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