diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-01-29 11:44:53 +0100 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-01-29 11:44:53 +0100 |
| commit | 88b281557a05fb785a42274bf0f3bc328f9eebfd (patch) | |
| tree | 487b42b54d8574941fac92997ff32fe1658b2592 /lib/python/Screens/TimerEdit.py | |
| parent | e79a0c2d96337514acb0763e537235c0ef997100 (diff) | |
| parent | 979f7263f0c8807dce237fcfb5586112c55e5e20 (diff) | |
| download | enigma2-88b281557a05fb785a42274bf0f3bc328f9eebfd.tar.gz enigma2-88b281557a05fb785a42274bf0f3bc328f9eebfd.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Screens/TimerEdit.py')
| -rw-r--r-- | lib/python/Screens/TimerEdit.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index 58cece6c..bb2d3c76 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -408,7 +408,7 @@ class TimerSanityConflict(Screen): self["actions"].actions.update({"green":self.toggleTimer1}) self["key_green"].setText(_("Enable")) self.key_green_choice = self.ENABLE - elif self.timer[0].isRunning() and not timer[0].repeated and self.key_green_choice != self.EMPTY: + elif self.timer[0].isRunning() and not self.timer[0].repeated and self.key_green_choice != self.EMPTY: self.removeAction("green") self["key_green"].setText(" ") self.key_green_choice = self.EMPTY @@ -428,7 +428,7 @@ class TimerSanityConflict(Screen): self["actions"].actions.update({"blue":self.toggleTimer2}) self["key_blue"].setText(_("Enable")) self.key_blue_choice = self.ENABLE - elif self.timer[x].isRunning() and not timer[x].repeated and self.key_blue_choice != self.EMPTY: + elif self.timer[x].isRunning() and not self.timer[x].repeated and self.key_blue_choice != self.EMPTY: self.removeAction("blue") self["key_blue"].setText(" ") self.key_blue_choice = self.EMPTY |