X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=mytest.py;h=3bdbcf2d63b94edad399440df75d202937f19a55;hp=99aecb14df9041a7be1c1ef4a300c4825e4a7c38;hb=7d30259cc4f44f65507366600e6238a5decd275f;hpb=e7a4be1d20a33dbd97acfa021db2f8b82bf7a844

diff --git a/mytest.py b/mytest.py
index 99aecb1..3bdbcf2 100644
--- a/mytest.py
+++ b/mytest.py
@@ -528,17 +528,18 @@ def runScreenTest():
 
 	from time import time
 	from Tools.DreamboxHardware import setFPWakeuptime
-	#get next record timer start time
-	nextRecordingTime = session.nav.RecordTimer.getNextRecordingTime()
-	#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:
+	wakeupList = [
+		x for x in
+				[session.nav.RecordTimer.getNextRecordingTime(),
+				session.nav.RecordTimer.getNextZapTime(),
+				plugins.getNextWakeupTime()]
+		if x != -1
+	]
+	wakeupList.sort()
+	if len(wakeupList):
+		startTime = wakeupList.pop(0)
 		if (startTime - nowTime < 330): # no time to switch box back on
 			setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds
 		else: