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/Components/FileList.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/python/Components/FileList.py') diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index 5824747d..3e38bd06 100644 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -127,8 +127,8 @@ class FileList(MenuList): if directory is None and self.showMountpoints: # present available mountpoints for p in harddiskmanager.getMountedPartitions(): - path = os_path.join(p.mountpoint,"") - if not self.inhibitMounts or ((not path in self.inhibitMounts) and (not self.inParentDirs(path, self.inhibitDirs))): + path = os_path.join(p.mountpoint, "") + if path not in self.inhibitMounts and not self.inParentDirs(path, self.inhibitDirs): self.list.append(FileEntryComponent(name = p.description, absolute = path, isDir = True)) files = [ ] directories = [ ] -- cgit v1.2.3