diff options
| -rw-r--r-- | lib/python/Components/Clock.py | 3 | ||||
| -rw-r--r-- | timer.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py index 68fabb90..e2d9d5f5 100644 --- 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) @@ -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 |