fixed localtime-issue in Clock

don't add repeated timers to processed_timers

diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py
index 68fabb9..e2d9d5f 100644 (file)
--- a/lib/python/Components/Clock.py
+++ b/lib/python/Components/Clock.py
@@ -25,8 +25,7 @@ class Clock(HTMLComponent, GUIComponent, VariableText):
 # "funktionalitaet"    
        def doClock(self):
                t = time.localtime()
-               hour = (t[3] + config.timezone.val.value) % 24;
-               timestr = "%2d:%02d:%02d" % (hour, t[4], t[5])
+               timestr = "%2d:%02d:%02d" % (t.tm_hour, t.tm_min, t.tm_sec)
                self.setText(timestr)
                setLCDClock(timestr)
 

diff --git a/timer.py b/timer.py
index 7855c09..6f33b54 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -146,11 +146,13 @@ class Timer:
                if w.state < TimerEntry.StateEnded:
                        bisect.insort(self.timer_list, w)
                else:
-                       bisect.insort(self.processed_timers, w)
                        if (w.repeated != 0):
                                w.processRepeated()
                                w.state = TimerEntry.StateWait
                                self.addTimerEntry(w)
+                       else:
+                               bisect.insort(self.processed_timers, w)
+
        
        def processActivation(self):
                t = int(time.time()) + 1