Timer.py: indicate error if instant record was not started
authorMoritz Venn <moritz.venn@freaque.net>
Tue, 18 Jan 2011 18:43:34 +0000 (19:43 +0100)
committerMoritz Venn <moritz.venn@freaque.net>
Tue, 18 Jan 2011 18:44:11 +0000 (19:44 +0100)
webinterface/src/WebComponents/Sources/Timer.py

index f2161a1..00c3a36 100644 (file)
@@ -197,7 +197,10 @@ class Timer(Source):
                        location = config.movielist.last_videodir.value
                        timer = RecordTimerEntry(serviceref, begin, end, name, description, eventid, False, False, 0, dirname=location)
                        timer.dontSave = True
-                       self.recordtimer.record(timer)
+                       ret = self.recordtimer.record(timer)
+                       if ret is not None:
+                               # a conflict is rather unlikely, but this can also indicate a non-recordable service
+                               ret = (False, "Timer conflict detected! Not recording!" )
 
                return ret