note about import *
[vuplus_dvbapp] / RecordTimer.py
index faec534..f41a485 100644 (file)
@@ -291,7 +291,7 @@ class RecordTimer(timer.Timer):
                        list.append('<timer')
                        list.append(' begin="' + str(int(timer.begin)) + '"')
                        list.append(' end="' + str(int(timer.end)) + '"')
-                       list.append(' serviceref="' + str(stringToXML(timer.service_ref)) + '"')
+                       list.append(' serviceref="' + str(timer.service_ref) + '"')
                        list.append(' repeated="' + str(int(timer.repeated)) + '"')
                        list.append(' name="' + str(stringToXML(timer.name)) + '"')
                        list.append(' description="' + str(stringToXML(timer.description)) + '"')
@@ -342,7 +342,7 @@ class RecordTimer(timer.Timer):
                                                                time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60
                                                        elif chktimecmp <= timecmp < (chktimecmp + (duration / 60)):
                                                                time_match = ((chktimecmp + (duration / 60)) - timecmp) * 60
-                               elif x.eit is None:
+                               else: #if x.eit is None:
                                        end = begin + duration
                                        if begin <= x.begin <= end:
                                                diff = end - x.begin