Merge commit 'origin/master' into tmbinc/FixTimingBugs

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index f8e0dbd7472ca5d9013b1ed8c2af6b509d1b980c..9f3b2ffbea0a555de2348ddfe74c7c2f4e48d806 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -63,7 +63,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                if event == iRecordableService.evEnd:
                        print "RecordTimer.staticGotRecordEvent(iRecordableService.evEnd)"
                        recordings = NavigationInstance.instance.getRecordings()
-                       if not len(recordings): # no more recordings exist
+                       if not recordings: # no more recordings exist
                                rec_time = NavigationInstance.instance.RecordTimer.getNextRecordingTime()
                                if rec_time > 0 and (rec_time - time.time()) < 360:
                                        print "another recording starts in", rec_time - time.time(), "seconds... do not shutdown yet"
@@ -192,8 +192,8 @@ class RecordTimerEntry(timer.TimerEntry, object):
                        try:
                                f = open(self.Filename + ".ts.meta", "w")
                                f.write(rec_ref.toString() + "\n")
-                               f.write(self.name + "\n")
-                               f.write(self.description + "\n")
+                               f.write(self.name.replace("\n", "") + "\n")
+                               f.write(self.description.replace("\n", "") + "\n")
                                f.write(str(self.begin) + "\n")
                                f.write(' '.join(self.tags))
                                f.close()