X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c646a9d7be631e75b8674db99e7979899f04ba68..e896fc8b8860ec9fc0e1f013d6405c454bfa88c8:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index a5c179c4..f41a4857 100644
--- 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:
@@ -293,8 +293,8 @@ class RecordTimer(timer.Timer):
 			list.append(' end="' + str(int(timer.end)) + '"')
 			list.append(' serviceref="' + str(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