git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no more crash when wakeup the box from standby
[enigma2.git]
/
mytest.py
diff --git
a/mytest.py
b/mytest.py
index 5bc08914afdab5ad1170ae8f1ce3fee90df9c939..2169857f13ecbe273d967be2aa3ec14030fa3ff9 100644
(file)
--- a/
mytest.py
+++ b/
mytest.py
@@
-387,7
+387,7
@@
class VolumeControl:
self.muteDialog.hide()
self.volumeDialog.setValue(vol)
self.muteDialog.hide()
self.volumeDialog.setValue(vol)
-from Screens.Standby import Standby, TryQuitMainloop, inTryQuitMainloop
+from Screens.Standby import Standby,
inStandby,
TryQuitMainloop, inTryQuitMainloop
class PowerKey:
""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
class PowerKey:
""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
@@
-398,7
+398,7
@@
class PowerKey:
self.powerKeyTimer.timeout.get().append(self.powertimer)
globalActionMap.actions["powerdown"]=self.powerdown
globalActionMap.actions["powerup"]=self.powerup
self.powerKeyTimer.timeout.get().append(self.powertimer)
globalActionMap.actions["powerdown"]=self.powerdown
globalActionMap.actions["powerup"]=self.powerup
- self.standbyblocked =
0
+ self.standbyblocked =
1
# self["PowerKeyActions"] = HelpableActionMap(self, "PowerKeyActions",
#{
#"powerdown": self.powerdown,
# self["PowerKeyActions"] = HelpableActionMap(self, "PowerKeyActions",
#{
#"powerdown": self.powerdown,
@@
-424,7
+424,8
@@
class PowerKey:
self.standby()
def standby(self):
self.standby()
def standby(self):
- if self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+ global inStandby
+ if not inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
self.session.open(Standby)
from Screens.Scart import Scart
self.session.open(Standby)
from Screens.Scart import Scart