X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=d8bed8f0577b012c7f5cdc7302ab67e264ae1574;hp=def75684d2a7e6b1411fc9363f4174eab6f9abe9;hb=2879d3645dc59425bb44217c6cfc8b5984246f5c;hpb=dd2f75a38c17459f1a3d46cf529a6b4fe3f7e3f2

diff --git a/RecordTimer.py b/RecordTimer.py
index def7568..d8bed8f 100755
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -102,7 +102,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
 		
 		assert isinstance(serviceref, ServiceReference)
 		
-		if serviceref.getType() == eServiceReference.idDVB and serviceref.getPath() == "":
+		if serviceref.isRecordable():
 			self.service_ref = serviceref
 		else:
 			self.service_ref = ServiceReference(None)
@@ -319,16 +319,14 @@ class RecordTimerEntry(timer.TimerEntry, object):
 		timersanitycheck = TimerSanityCheck(NavigationInstance.instance.RecordTimer.timer_list, dummyentry)
 		if not timersanitycheck.check():
 			simulTimerList = timersanitycheck.getSimulTimerList()
-			new_end = simulTimerList[1].begin
-			del simulTimerList
-			new_end -= 30				# 30 Sekunden Prepare-Zeit lassen
-		del dummyentry
+			if simulTimerList is not None and len(simulTimerList) > 1:
+				new_end = simulTimerList[1].begin
+				new_end -= 30				# 30 Sekunden Prepare-Zeit lassen
 		if new_end <= time():
 			return False
 		self.end = new_end
 		return True
-	
-	
+
 	def sendStandbyNotification(self, answer):
 		if answer:
 			Notifications.AddNotification(Screens.Standby.Standby)
@@ -517,7 +515,7 @@ class RecordTimer(timer.Timer):
 		checkit = True
 		for timer in root.findall("timer"):
 			newTimer = createTimer(timer)
-			if (self.record(newTimer, True, True) is not None) and (checkit == True):
+			if (self.record(newTimer, True, dosave=False) is not None) and (checkit == True):
 				from Tools.Notifications import AddPopup
 				from Screens.MessageBox import MessageBox
 				AddPopup(_("Timer overlap in timers.xml detected!\nPlease recheck it!"), type = MessageBox.TYPE_ERROR, timeout = 0, id = "TimerLoadFailed")