X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=timer.py;h=a98481c0a3f957bcf0cff965f2a8de1e785feb2c;hb=8533d3d6b365662101f54abd7d915eba5009df94;hp=c03eb1e78d3fae37087230733ff138cf03377f51;hpb=f9eab3576219c9dc287b4ccba4507631c65663e8;p=vuplus_dvbapp

diff --git a/timer.py b/timer.py
index c03eb1e..a98481c 100644
--- a/timer.py
+++ b/timer.py
@@ -113,6 +113,11 @@ class Timer:
 		for f in self.on_state_change:
 			f(entry)
 			
+	def getNextRecordingTime(self):
+		if len(self.timer_list) > 0:
+			return self.timer_list[0].begin
+		return -1
+			
 	def cleanup(self):
 		self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
 	
@@ -163,7 +168,10 @@ class Timer:
 	
 	def timeChanged(self, timer):
 		timer.timeChanged()
-		self.timer_list.remove(timer)
+		if timer.state == TimerEntry.StateEnded:
+			self.processed_timers.remove(timer)
+		else:
+			self.timer_list.remove(timer)
 
 		self.addTimerEntry(timer)
 	
@@ -173,8 +181,7 @@ class Timer:
 		# when activating a timer which has already passed,
 		# simply abort the timer. don't run trough all the stages.
 		if w.shouldSkip():
-			w.abort()
-			bisect.insort(self.processed_timers, w)
+			w.state = TimerEntry.StateEnded
 		else:
 			# when active returns true, this means "accepted".
 			# otherwise, the current state is kept.