put out an error message on instant record on non invalid services

refs #718

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index dab1c0f..0bb7fd3 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1524,15 +1524,17 @@ class InfoBarInstantRecord:
 
                recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = preferredInstantRecordPath())
                recording.dontSave = True
-               
+
                if event is None or limitEvent == False:
                        recording.autoincrease = True
-                       if recording.setAutoincreaseEnd():
-                               self.session.nav.RecordTimer.record(recording)
-                               self.recording.append(recording)
+                       recording.setAutoincreaseEnd()
+
+               simulTimerList = self.session.nav.RecordTimer.record(recording)
+
+               if simulTimerList is None:      # no conflict
+                       self.recording.append(recording)
                else:
-                       simulTimerList = self.session.nav.RecordTimer.record(recording)
-                       if simulTimerList is not None:  # conflict with other recording
+                       if len(simulTimerList) > 1: # with other recording
                                name = simulTimerList[1].name
                                name_date = ' '.join((name, strftime('%c', localtime(simulTimerList[1].begin))))
                                print "[TIMER] conflicts with", name_date
@@ -1543,9 +1545,9 @@ class InfoBarInstantRecord:
                                        self.session.open(MessageBox, _("Record time limited due to conflicting timer %s") % name_date, MessageBox.TYPE_INFO)
                                else:
                                        self.session.open(MessageBox, _("Couldn't record due to conflicting timer %s") % name, MessageBox.TYPE_INFO)
-                               recording.autoincrease = False
                        else:
-                               self.recording.append(recording)
+                               self.session.open(MessageBox, _("Couldn't record due to invalid service %s") % serviceref, MessageBox.TYPE_INFO)
+                       recording.autoincrease = False
 
        def isInstantRecordRunning(self):
                print "self.recording:", self.recording