X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=mytest.py;h=7f5d598a0a8795c1a32477119d1cc1f72ad6d5f8;hb=fb0f569733c71a83f0c73a518f8aead20af23513;hp=b58ec2df62d46a4ec8c9543bd656c5377b6a1024;hpb=690b1b1a235752794a92e99bf513a6db01f42748;p=vuplus_dvbapp

diff --git a/mytest.py b/mytest.py
index b58ec2d..7f5d598 100755
--- a/mytest.py
+++ b/mytest.py
@@ -376,7 +376,7 @@ class PowerKey:
 			self.standby()
 
 	def standby(self):
-		if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+		if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND and self.session.in_exec:
 			self.session.open(Screens.Standby.Standby)
 
 profile("Scart")
@@ -445,11 +445,12 @@ def runScreenTest():
 			return
 
 		screen = screensToRun[0][1]
+		args = screensToRun[0][2:]
 
 		if screensToRun:
-			session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
+			session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen, *args)
 		else:
-			session.open(screen)
+			session.open(screen, *args)
 
 	runNextScreen(session, screensToRun)
 
@@ -481,10 +482,10 @@ def runScreenTest():
 	if wakeupList:
 		from time import strftime
 		startTime = wakeupList[0]
-		if (startTime[0] - nowTime) < 330: # no time to switch box back on
+		if (startTime[0] - nowTime) < 270: # no time to switch box back on
 			wptime = nowTime + 30  # so switch back on in 30 seconds
 		else:
-			wptime = startTime[0] - 300
+			wptime = startTime[0] - 240
 		if not config.misc.useTransponderTime.value:
 			print "dvb time sync disabled... so set RTC now to current linux time!", strftime("%Y/%m/%d %H:%M", localtime(nowTime))
 			setRTCtime(nowTime)