Merge branch 'master' of /home/tmbinc/enigma2-git

[vuplus_dvbapp] / mytest.py

diff --git a/mytest.py b/mytest.py
index 014f94c..ee22e20 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -277,7 +277,7 @@ class Session:
 
        def open(self, screen, *arguments, **kwargs):
                if len(self.dialog_stack) and not self.in_exec:
-                       raise "modal open are allowed only from a screen which is modal!"
+                       raise RuntimeError("modal open are allowed only from a screen which is modal!")
                        # ...unless it's the very first screen.
 
                self.pushCurrent()
@@ -343,6 +343,9 @@ class PowerKey:
                        self.session.open(Screens.Standby.TryQuitMainloop, 1)
 
        def powerlong(self):
+               if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
+                       return
+
                self.standbyblocked = 1
                action = config.usage.on_long_powerpress.value
                if action == "shutdown":