X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=1a64c5effdd54bb9d0fc8032808c1db80c39b02d;hp=45a21aebfd02db9d99cd30418fa2a8375aa4224f;hb=cb50b5479d207eae71e302ff37e5960281c039c8;hpb=af86cdfc155f85ea6a4716b99840b697686159e6

diff --git a/RecordTimer.py b/RecordTimer.py
index 45a21ae..1a64c5e 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -103,6 +103,13 @@ class RecordTimer(timer.Timer):
 			self.loadTimer()
 		except:
 			print "unable to load timers from file!"
+			
+	def isRecording(self):
+		isRunning = False
+		for timer in self.timer_list:
+			if timer.isRunning():
+				isRunning = True
+		return isRunning
 	
 	def loadTimer(self):
 		# TODO: PATH!
@@ -156,8 +163,12 @@ class RecordTimer(timer.Timer):
 		elif entry.state != timer.TimerEntry.StateEnded:
 			entry.activate(timer.TimerEntry.EventAbort)
 			self.timer_list.remove(entry)
+
 			self.calcNextActivation()
 			print "timer did not yet start - removing"
+
+			# the timer was aborted, and removed.
+			return
 		else:
 			print "timer did already end - doing nothing."