add a "nothing connected" option to the sat setup for nim b

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 4724876acb1f859e89f7705db414a4cb98a58068..85e9d172c3ad840057e8c3937705565586e91a7b 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -30,6 +30,8 @@ class RecordTimerEntry(timer.TimerEntry):
                self.description = description
                self.timer = None
                self.record_service = None
+               self.wantStart = False
+               self.prepareOK = False
                
        def calculateFilename(self):
                service_name = self.service_ref.getServiceName()
@@ -80,16 +82,15 @@ class RecordTimerEntry(timer.TimerEntry):
                        else:
                                # error.
                                Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"))
-               elif self.record_service == None:
-                       if event != self.EventAbort:
-                               print "timer record start failed, can't finish recording."
                elif event == self.EventStart:
                        if self.prepareOK:
                                self.record_service.start()
                                print "timer started!"
                        else:
                                print "prepare failed, thus start failed, too."
+                               self.wantStart = True
                elif event == self.EventEnd or event == self.EventAbort:
+                       self.wantStart = False
                        if self.prepareOK:
                                self.record_service.stop()
                                self.record_service = None
@@ -105,6 +106,9 @@ class RecordTimerEntry(timer.TimerEntry):
                if answer == True:
                        NavigationInstance.instance.stopUserServices()
                        self.activate(self.EventPrepare)
+                       if self.wantStart:
+                               print "post-activating record"
+                               self.activate(self.EventStart)
                else:
                        print "user killed record"
 
@@ -165,7 +169,7 @@ class RecordTimer(timer.Timer):
                        t.setAttribute("serviceref", str(timer.service_ref))
                        t.setAttribute("repeated", str(timer.repeated))                 
                        #t.setAttribute("epgdata", timer.)
-                       t.setAttribute("description", timer.description)
+                       t.setAttribute("description", "no description") # timer.description)
                        root_element.appendChild(t)
                        t = doc.createTextNode("\n")
                        root_element.appendChild(t)