beautify messagebox

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index f1b33592d616964a313983f8752b85d95c012bd4..37aecdbdb574401abde0a65d36b431e14c12152c 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -3,6 +3,7 @@ import codecs
 #from time import datetime
 from Tools import Directories, Notifications
 
+from Components.config import config
 import timer
 import xml.dom.minidom
 
@@ -65,7 +66,7 @@ class RecordTimerEntry(timer.TimerEntry):
                self.record_service = NavigationInstance.instance.recordService(self.service_ref)
                if self.record_service == None:
                        return False
-               else:   
+               else:
                        if self.record_service.prepare(self.Filename + ".ts"):
                                self.record_service = None
                                return False
@@ -85,7 +86,10 @@ class RecordTimerEntry(timer.TimerEntry):
                                self.prepareOK = True
                        else:
                                # error.
-                               Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"))
+                               if config.recording.asktozap.value == 0:
+                                       Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"))
+                               else: # zap without asking
+                                       self.failureCB(True)
                elif event == self.EventStart:
                        if self.prepareOK:
                                self.record_service.start()
@@ -98,6 +102,7 @@ class RecordTimerEntry(timer.TimerEntry):
                        if self.prepareOK:
                                self.record_service.stop()
                                self.record_service = None
+                               
                                print "Timer successfully ended"
                        else:
                                print "prepare failed, thus nothing was recorded."
@@ -108,8 +113,11 @@ class RecordTimerEntry(timer.TimerEntry):
 
        def failureCB(self, answer):
                if answer == True:
-                       NavigationInstance.instance.stopUserServices()
+                       #NavigationInstance.instance.stopUserServices()
+                       print "[RecordTimer] zapping to", self.service_ref
+                       NavigationInstance.instance.playService(self.service_ref.ref)
                        self.activate(self.EventPrepare)
+
                        if self.wantStart:
                                print "post-activating record"
                                self.activate(self.EventStart)