diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 03:47:44 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 03:47:44 +0100 |
| commit | a4b8eb676ba549ebe8cf347f15888e51d8914789 (patch) | |
| tree | f88416c61e96ec26675c8817a6961a74207f0f7b /lib/python/Screens/TimerEntry.py | |
| parent | dce87891f204f8e1f7151c4a3ba00b9dd048e795 (diff) | |
| parent | c46312d7f5ce4113ece4c33595b7192eccadcb1d (diff) | |
| download | enigma2-a4b8eb676ba549ebe8cf347f15888e51d8914789.tar.gz enigma2-a4b8eb676ba549ebe8cf347f15888e51d8914789.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts:
lib/python/Screens/InfoBarGenerics.py
Diffstat (limited to 'lib/python/Screens/TimerEntry.py')
| -rw-r--r-- | lib/python/Screens/TimerEntry.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 0544eff1..92a16af8 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -97,7 +97,7 @@ class TimerEntry(Screen, ConfigListScreen): self.timerentry_type = ConfigSelection(choices = [("once",_("once")), ("repeated", _("repeated"))], default = type) self.timerentry_name = ConfigText(default = self.timer.name, visible_width = 50, fixed_size = False) self.timerentry_description = ConfigText(default = self.timer.description, visible_width = 50, fixed_size = False) - self.timerentry_tags = self.timer.tags + [] + self.timerentry_tags = self.timer.tags[:] self.timerentry_tagsset = ConfigSelection(choices = [len(self.timerentry_tags) == 0 and "None" or " ".join(self.timerentry_tags)]) self.timerentry_repeated = ConfigSelection(default = repeated, choices = [("daily", _("daily")), ("weekly", _("weekly")), ("weekdays", _("Mon-Fri")), ("user", _("user defined"))]) |