From: Felix Domke <tmbinc@elitedvb.net>
Date: Mon, 2 Oct 2006 23:59:22 +0000 (+0000)
Subject: fix non-ascii chars in service reference, follow new config stuff
X-Git-Tag: 2.6.0~3020
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/19e535d1d17e94e001d47f718c0304386b6309c8?hp=a4507d9c7dde86f36ccb5718e89d41f29be83446

fix non-ascii chars in service reference, follow new config stuff
---

diff --git a/RecordTimer.py b/RecordTimer.py
index da629ee7..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")