X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/65e19746f08f1287005861692322cdf868b06dc6..094ce8fe71fe874774ba9ade2801ae4069333b96:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 25c2b036..d8312493 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -31,8 +31,8 @@ def parseEvent(ev):
 	begin = ev.getBeginTime()
 	end = begin + ev.getDuration()
 	eit = ev.getEventId()
-	begin -= config.recording.margin_before.value[0] * 60
-	end += config.recording.margin_after.value[0] * 60
+	begin -= config.recording.margin_before.value * 60
+	end += config.recording.margin_after.value * 60
 	return (begin, end, name, description, eit)
 
 class AFTEREVENT:
@@ -158,7 +158,7 @@ class RecordTimerEntry(timer.TimerEntry):
 			self.log(7, "prepare failed")
 			if self.first_try_prepare:
 				self.first_try_prepare = False
-				if config.recording.asktozap.value == 0:
+				if not config.recording.asktozap.value:
 					self.log(8, "asking user to zap away")
 					Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"), timeout=20)
 				else: # zap without asking
@@ -232,7 +232,7 @@ class RecordTimerEntry(timer.TimerEntry):
 def createTimer(xml):
 	begin = int(xml.getAttribute("begin"))
 	end = int(xml.getAttribute("end"))
-	serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
+	serviceref = ServiceReference(xml.getAttribute("serviceref").encode("utf-8"))
 	description = xml.getAttribute("description").encode("utf-8")
 	repeated = xml.getAttribute("repeated").encode("utf-8")
 	disabled = long(xml.getAttribute("disabled") or "0")
@@ -338,7 +338,7 @@ 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(stringToXML(timer.name.encode("utf-8"))) + '"')
+			list.append(' name="' + str(stringToXML(timer.name)) + '"')
 			list.append(' description="' + str(stringToXML(timer.description)) + '"')
 			list.append(' afterevent="' + str(stringToXML({ AFTEREVENT.NONE: "nothing", AFTEREVENT.STANDBY: "standby", AFTEREVENT.DEEPSTANDBY: "deepstandby" }[timer.afterEvent])) + '"')
 			if timer.eit is not None: