X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c2217d20163573e3a062463bfe0522e4f70b1fa4..64cfba23aba53b4ab3933284b2a4a9ef5ec68e26:/lib/python/Components/TimerSanityCheck.py diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py index cf505022..8f48d1ec 100644 --- a/lib/python/Components/TimerSanityCheck.py +++ b/lib/python/Components/TimerSanityCheck.py @@ -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