X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/60a9bcb6f7b0e928a836dccd1008b82f837a0461..359c587f3be20090ac84b152abde2886a391a55d:/mytest.py

diff --git a/mytest.py b/mytest.py
index 58c5c680..098675b6 100644
--- a/mytest.py
+++ b/mytest.py
@@ -155,11 +155,11 @@ class Session:
 		if callback is not None:
 			callback(*retval)
 
-	def execBegin(self, first=True):
+	def execBegin(self, first=True, do_show = True):
 		assert not self.in_exec 
 		self.in_exec = True
 		c = self.current_dialog
-		
+
 		# when this is an execbegin after a execend of a "higher" dialog,
 		# popSummary already did the right thing.
 		if first:
@@ -172,7 +172,7 @@ class Session:
 		c.execBegin()
 
 		# when execBegin opened a new dialog, don't bother showing the old one.
-		if c == self.current_dialog:
+		if c == self.current_dialog and do_show:
 			c.show()
 		
 	def execEnd(self, last=True):
@@ -246,13 +246,13 @@ class Session:
 	 
 	def pushCurrent(self):
 		if self.current_dialog is not None:
-			self.dialog_stack.append(self.current_dialog)
+			self.dialog_stack.append((self.current_dialog, self.current_dialog.shown))
 			self.execEnd(last=False)
-	
+
 	def popCurrent(self):
 		if len(self.dialog_stack):
-			self.current_dialog = self.dialog_stack.pop()
-			self.execBegin(first=False)
+			(self.current_dialog, do_show) = self.dialog_stack.pop()
+			self.execBegin(first=False, do_show=do_show)
 		else:
 			self.current_dialog = None
 
@@ -493,13 +493,21 @@ def runScreenTest():
 
 	from time import time
 	from Tools.DreamboxHardware import setFPWakeuptime
+	#get next record timer start time
 	nextRecordingTime = session.nav.RecordTimer.getNextRecordingTime()
-	if nextRecordingTime != -1:
-		if (nextRecordingTime - time() < 330): # no time to switch box back on
-			setFPWakeuptime(time() + 30) # so switch back on in 30 seconds
+	#get next zap timer start time
+	nextZapTime = session.nav.RecordTimer.getNextZapTime()
+	#get currentTime
+	nowTime = time()
+	if nextZapTime != -1 and nextRecordingTime != -1:
+		startTime = nextZapTime < nextRecordingTime and nextZapTime or nextRecordingTime
+	else:
+		startTime = nextZapTime != -1 and nextZapTime or nextRecordingTime
+	if startTime != -1:
+		if (startTime - nowTime < 330): # no time to switch box back on
+			setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds
 		else:
-			setFPWakeuptime(nextRecordingTime - (300))
-	
+			setFPWakeuptime(startTime - 300)
 	session.nav.stopService()
 	session.nav.shutdown()