X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FTimerSanityCheck.py;h=b472a19e130c305512a5a5eeee931d5a103d11c9;hb=088902285e167e612e0f4ae8ae9f72a3e9079ea4;hp=cf50502215000653214a785bb87c31b1ba1c6f6f;hpb=7f6790f2afe0fb6f65746fdc1c00935ed1567146;p=vuplus_dvbapp

diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py
index cf50502..b472a19 100644
--- a/lib/python/Components/TimerSanityCheck.py
+++ b/lib/python/Components/TimerSanityCheck.py
@@ -12,8 +12,8 @@ class TimerSanityCheck:
 		self.simultimer = []
 		self.rep_eventlist = []
 		self.nrep_eventlist = []
-		self.bflag = 1
-		self.eflag = -1
+		self.bflag = -1
+		self.eflag = 1
 
 	def check(self, ext_timer=1):
 		print "check"
@@ -36,6 +36,12 @@ class TimerSanityCheck:
 					return True
 				else:
 					if timer.begin == self.newtimer.begin:
+						fl1 = timer.service_ref.ref.flags & eServiceReference.isGroup
+						fl2 = self.newtimer.service_ref.ref.flags & eServiceReference.isGroup
+						if fl1 != fl2:
+							return False
+						if fl1: #is group
+							return timer.service_ref.ref.getPath() == self.newtimer.service_ref.ref.getPath()
 						getUnsignedDataRef1 = timer.service_ref.ref.getUnsignedData
 						getUnsignedDataRef2 = self.newtimer.service_ref.ref.getUnsignedData
 						for x in (1, 2, 3, 4):
@@ -135,8 +141,7 @@ class TimerSanityCheck:
 							self.nrep_eventlist.extend([(new_event_begin, self.bflag, event[1]),(new_event_end, self.eflag, event[1])])
 		else:
 			offset_0 = 345600 # the Epoch begins on Thursday
-			weeks = 2 # test two weeks to take care of Sunday-Monday transitions
-			for cnt in range(weeks):
+			for cnt in (0, 1): # test two weeks to take care of Sunday-Monday transitions
 				for event in self.rep_eventlist:
 					if event[1] == -1: # -1 is the identifier of the changed timer
 						event_begin = self.newtimer.begin