From 6e68543591be09859bbaa4c19e0065e65d8acfe3 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Wed, 2 Jul 2008 12:05:57 +0000 Subject: # # Some Bugfixes related to locationstuff.patch # # ritzMo: # - fix a missing member in ConfigLocations (argument was ignord but # expected later in the code) # - take care of the fact that an instant record might not be saved in # default record location (fixes error when no hdd installed) # - remove overly complex Screen.close override in LocationBox # - fix deathscreen in LocationBox context menu # Anders Holst: # - fix deathscreen when default record location not in bookmarks when # editing timers which would be stored there # - don't ignore inhibitDirs if inhibitMounts is unset # - hide potentially dangerous folders for all users in MovieLocationBox # (previously / was hidden for userlevel < expert) # --- lib/python/Screens/TimerEntry.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/python/Screens/TimerEntry.py') diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index b490f6dd..ca1a3929 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -99,10 +99,11 @@ class TimerEntry(Screen, ConfigListScreen): self.timerentry_enddate = ConfigDateTime(default = self.timer.end, formatstring = _("%d.%B %Y"), increment = 86400) self.timerentry_endtime = ConfigClock(default = self.timer.end) + default = self.timer.dirname or resolveFilename(SCOPE_HDD) tmp = config.movielist.videodirs.value - if self.timer.dirname and not self.timer.dirname in tmp: - tmp.append(self.timer.dirname) - self.timerentry_dirname = ConfigSelection(default = self.timer.dirname or resolveFilename(SCOPE_HDD), choices = tmp) + if default not in tmp: + tmp.append(default) + self.timerentry_dirname = ConfigSelection(default = default, choices = tmp) self.timerentry_repeatedbegindate = ConfigDateTime(default = self.timer.repeatedbegindate, formatstring = _("%d.%B %Y"), increment = 86400) -- cgit v1.2.3