X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c2bbed774d6e5c51b4af23a60a95aca74aa5d4e9..ec55d380cf26ce2d8c14ec0167f97927a8f46d40:/mytest.py

diff --git a/mytest.py b/mytest.py
old mode 100644
new mode 100755
index 014f94c9..c335bf2d
--- a/mytest.py
+++ b/mytest.py
@@ -76,7 +76,6 @@ from Components.PluginComponent import plugins
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
 from Screens.DefaultWizard import *
-from Screens.ImageWizard import *
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 import Screens.Rc
@@ -277,7 +276,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 +342,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":