get and show ip-address with DHCP... untested (an evil hacker has taken my box)

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 134079586df374d7a0881d5839550e549eb986f5..d893382a228b8b132e8d8d03ea12143db9bd68dd 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -155,6 +155,8 @@ class RecordTimer(timer.Timer):
 
        def removeEntry(self, entry):
                print "[Timer] Remove " + str(entry)
+               
+               entry.repeated = False
 
                if entry.state == timer.TimerEntry.StateRunning:
                        print "remove running timer."
@@ -163,8 +165,12 @@ class RecordTimer(timer.Timer):
                elif entry.state != timer.TimerEntry.StateEnded:
                        entry.activate(timer.TimerEntry.EventAbort)
                        self.timer_list.remove(entry)
+
                        self.calcNextActivation()
                        print "timer did not yet start - removing"
+
+                       # the timer was aborted, and removed.
+                       return
                else:
                        print "timer did already end - doing nothing."