Hotplug: also close thread on language change

[enigma2.git] / lib / python / Components / TimerSanityCheck.py

diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py
index 8f48d1ecb0f3588125b4eae4ff1798da33788bc9..b9dda6a6697926db84be0119808943614d61e43f 100644 (file)
--- a/lib/python/Components/TimerSanityCheck.py
+++ b/lib/python/Components/TimerSanityCheck.py
@@ -2,6 +2,7 @@ import NavigationInstance
 from time import localtime, mktime, gmtime
 from ServiceReference import ServiceReference
 from enigma import iServiceInformation, eServiceCenter, eServiceReference
 from time import localtime, mktime, gmtime
 from ServiceReference import ServiceReference
 from enigma import iServiceInformation, eServiceCenter, eServiceReference

+from timer import TimerEntry

 
 class TimerSanityCheck:
        def __init__(self, timerlist, newtimer=None):
 
 class TimerSanityCheck:
        def __init__(self, timerlist, newtimer=None):


@@ -12,8 +13,8 @@ class TimerSanityCheck:
                self.simultimer = []
                self.rep_eventlist = []
                self.nrep_eventlist = []
                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"
 
        def check(self, ext_timer=1):
                print "check"


@@ -107,7 +108,7 @@ class TimerSanityCheck:
                                                        self.rep_eventlist.append((begin, idx))
                                                begin += 86400
                                                rflags >>= 1
                                                        self.rep_eventlist.append((begin, idx))
                                                begin += 86400
                                                rflags >>= 1

-                               else:
+                               elif timer.state < TimerEntry.StateEnded:

                                        self.nrep_eventlist.extend([(timer.begin,self.bflag,idx),(timer.end,self.eflag,idx)])
                        idx += 1
 
                                        self.nrep_eventlist.extend([(timer.begin,self.bflag,idx),(timer.end,self.eflag,idx)])
                        idx += 1