aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-10-06 12:02:41 +0200
committerghost <andreas.monzner@multimedia-labs.de>2010-10-06 12:02:41 +0200
commitd04e6435efecf42a192a4f6c71dca9a1a053d5fb (patch)
tree507eeb307a39e048edaefc6b4c2e82ce3a739d7b /lib/python
parent5928c8c18abacbedd119752fe294a9393da6d2f7 (diff)
parenteedaa114b5af841f0e4442274d4408be98d956ce (diff)
downloadenigma2-d04e6435efecf42a192a4f6c71dca9a1a053d5fb.tar.gz
enigma2-d04e6435efecf42a192a4f6c71dca9a1a053d5fb.zip
Merge branch 'bug_538_ignore_global_actions_in_standby'
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/Standby.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 406b87cb..1a7ebbd1 100644
--- 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