Merge pull request #18 from Dima73/master
authorlittlesat <littlesat99@yahoo.com>
Sat, 8 Aug 2015 13:21:56 +0000 (15:21 +0200)
committerlittlesat <littlesat99@yahoo.com>
Sat, 8 Aug 2015 13:21:56 +0000 (15:21 +0200)
Fix conflict timers (step 1)

lib/python/Components/TimerList.py

index 48065f8..07718f3 100644 (file)
@@ -48,7 +48,7 @@ class TimerList(HTMLComponent, GUIComponent, object):
                else:
                        text = repeatedtext + ((" %s ... %s (%d " + _("mins") + ")") % (begin[1], FuzzyTime(timer.end)[1], (timer.end - timer.begin) / 60))
                icon = None
-               if not processed:
+               if not processed and not timer.disabled:
                        if timer.state == TimerEntry.StateWaiting:
                                state = _("waiting")
                                icon = self.iconWait