X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FTimerSanityCheck.py;h=cf02459de26f56e614f605736d2b2b0dcdfdfb46;hp=031c9caee7096e01b2a50b4ce83803fa0f4946e9;hb=76e5181cade262b86610dcc851bcb4452196ccdc;hpb=68182033644faf17e06f10d1b98a128b5e3a7058

diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py
index 031c9ca..cf02459 100644
--- a/lib/python/Components/TimerSanityCheck.py
+++ b/lib/python/Components/TimerSanityCheck.py
@@ -37,7 +37,7 @@ class TimerSanityCheck:
 					if timer.begin == self.newtimer.begin:
 						getUnsignedDataRef1 = timer.service_ref.ref.getUnsignedData
 						getUnsignedDataRef2 = self.newtimer.service_ref.ref.getUnsignedData
-						for x in range(1,5):
+						for x in (1, 2, 3, 4):
 							if getUnsignedDataRef1(x) != getUnsignedDataRef2(x):
 								break;
 						else:
@@ -173,8 +173,7 @@ class TimerSanityCheck:
 					def getServiceType(ref): # helper function to get a service type of a service reference
 						serviceInfo = serviceHandler.info(ref)
 						serviceInfo = serviceInfo and serviceInfo.getInfoObject(ref, iServiceInformation.sTransponderData)
-						if serviceInfo:
-							return { "Satellite" : "DVB-S", "Cable" : "DVB-C", "Terrestrial" : "DVB-T"}[serviceInfo["type"]]
+						return serviceInfo and serviceInfo["tuner_type"] or ""
 
 					ref = timer.service_ref.ref
 					if ref.flags & eServiceReference.isGroup: # service group ?
@@ -200,7 +199,7 @@ class TimerSanityCheck:
 					if timer == fakeRec[0] and fakeRec[1]:
 						NavigationInstance.instance.stopRecordService(fakeRec[1])
 						fakeRecList.remove(fakeRec)
-				del fakeRec
+				fakeRec = None
 				for entry in overlaplist:
 					if entry[1] == timer:
 						overlaplist.remove(entry)