X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fb412ff32c7938649c72d55eed3f5c8ccb5e0a99..19e535d1d17e94e001d47f718c0304386b6309c8:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 10a60138..d8312493 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -7,7 +7,7 @@ from Components.config import config
 import timer
 import xml.dom.minidom
 
-from enigma import quitMainloop, eEPGCache, eEPGCachePtr
+from enigma import quitMainloop, eEPGCache
 
 from Screens.MessageBox import MessageBox
 import NavigationInstance
@@ -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,12 +158,12 @@ 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=15)
+					Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"), timeout=20)
 				else: # zap without asking
 					self.log(9, "zap without asking")
-					Notifications.AddNotification(MessageBox, _("In order to record a timer, the TV was switched to the recording service!\n"), type=MessageBox.TYPE_WARNING, timeout=15)
+					Notifications.AddNotification(MessageBox, _("In order to record a timer, the TV was switched to the recording service!\n"), type=MessageBox.TYPE_INFO, timeout=20)
 					self.failureCB(True)
 
 			self.do_backoff()
@@ -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")