timer.py: revert change needed for recordtimer add own doActivate to recordtimer

diff --git a/RecordTimer.py b/RecordTimer.py
index a6c19c0550b9780b5537cb3c986fcdb0d82ab89a..cdd37eb598f2e7a7fdc3cb252a29e3803991f6ec 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -440,7 +440,36 @@ class RecordTimer(timer.Timer):
                        self.loadTimer()
                except IOError:
                        print "unable to load timers from file!"
-                       
+
+       def doActivate(self, w):
+               # when activating a timer which has already passed,
+               # simply abort the timer. don't run trough all the stages.
+               if w.shouldSkip():
+                       w.state = TimerEntry.StateEnded
+               else:
+                       # when active returns true, this means "accepted".
+                       # otherwise, the current state is kept.
+                       # the timer entry itself will fix up the delay then.
+                       if w.activate():
+                               w.state += 1
+
+               self.timer_list.remove(w)
+
+               # did this timer reached the last state?
+               if w.state < TimerEntry.StateEnded:
+                       # no, sort it into active list
+                       insort(self.timer_list, w)
+               else:
+                       # yes. Process repeated, and re-add.
+                       if w.repeated:
+                               w.processRepeated()
+                               w.state = TimerEntry.StateWaiting
+                               self.addTimerEntry(w)
+                       else:
+                               insort(self.processed_timers, w)
+               
+               self.stateChanged(w)
+
        def isRecording(self):
                isRunning = False
                for timer in self.timer_list:

diff --git a/timer.py b/timer.py
index 35578ed8b72389a8c22b69bf4bbe86b8e4bfe3b2..aaae0b2a18f49ff0cb045ab82eea1d07a24e42b2 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -245,6 +245,8 @@ class Timer:
                self.addTimerEntry(timer)
        
        def doActivate(self, w):
+               self.timer_list.remove(w)
+
                # when activating a timer which has already passed,
                # simply abort the timer. don't run trough all the stages.
                if w.shouldSkip():
@@ -256,8 +258,6 @@ class Timer:
                        if w.activate():
                                w.state += 1
 
-               self.timer_list.remove(w)
-
                # did this timer reached the last state?
                if w.state < TimerEntry.StateEnded:
                        # no, sort it into active list