diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-01-27 21:10:01 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-01-27 21:10:01 +0100 |
| commit | 979f7263f0c8807dce237fcfb5586112c55e5e20 (patch) | |
| tree | 051cda7c4f8dbe4edd7ed4b92aeb9b6faf073547 /lib/python/Screens | |
| parent | 80059ab78691323ff8bb30ba4db8577a5185fc6d (diff) | |
| parent | fe1c9f7cf4e292566548eb5ce2fed90ad669a186 (diff) | |
| download | enigma2-979f7263f0c8807dce237fcfb5586112c55e5e20.tar.gz enigma2-979f7263f0c8807dce237fcfb5586112c55e5e20.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Screens')
| -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 |