diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-07-02 12:05:57 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-07-02 12:05:57 +0000 |
| commit | 6e68543591be09859bbaa4c19e0065e65d8acfe3 (patch) | |
| tree | 8a76703f07a3b245ac9e5629a18bafbb0c63e19f /lib/python/Components | |
| parent | d2efe2fd3e564506c4c1ceea54c06d4391d35d37 (diff) | |
| download | enigma2-6e68543591be09859bbaa4c19e0065e65d8acfe3.tar.gz enigma2-6e68543591be09859bbaa4c19e0065e65d8acfe3.zip | |
#
# 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)
#
Diffstat (limited to 'lib/python/Components')
| -rw-r--r-- | lib/python/Components/FileList.py | 4 | ||||
| -rw-r--r-- | lib/python/Components/config.py | 1 |
2 files changed, 3 insertions, 2 deletions
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 = [ ] diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 529b6020..8cb70987 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -935,6 +935,7 @@ class ConfigSet(ConfigElement): class ConfigLocations(ConfigElement): def __init__(self, default = [], visible_width = False): ConfigElement.__init__(self) + self.visible_width = visible_width self.pos = -1 self.default = default self.locations = [] |