fix isInTimer for non-repeated timers

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index a5c179c4979b4ed6bd788a30d6c26d2b07887e28..a2f21dfb90b5a058f1320a8662fbcf5de8dd8450 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -12,7 +12,7 @@ from Screens.SubserviceSelection import SubserviceSelection
 import NavigationInstance
 from time import localtime
 
-from Tools.XMLTools import elementsWithTag, mergeText, filterXMLString
+from Tools.XMLTools import elementsWithTag, mergeText, stringToXML
 from ServiceReference import ServiceReference
 
 # ok, for descriptions etc we have:
@@ -291,10 +291,10 @@ 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(timer.service_ref) + '"')
+                       list.append(' serviceref="' + str(stringToXML(timer.service_ref)) + '"')
                        list.append(' repeated="' + str(int(timer.repeated)) + '"')
-                       list.append(' name="' + str(filterXMLString(timer.name)) + '"')
-                       list.append(' description="' + str(filterXMLString(timer.description)) + '"')
+                       list.append(' name="' + str(stringToXML(timer.name)) + '"')
+                       list.append(' description="' + str(stringToXML(timer.description)) + '"')
                        if timer.eit is not None:
                                list.append(' eit="' + str(timer.eit) + '"')
                        list.append(' disabled="' + str(int(timer.disabled)) + '"')
@@ -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