aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components/FileList.py
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-11-03 19:40:57 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-11-03 19:40:57 +0100
commit18469e4dedcfe75e8128b489774f79fb790a23da (patch)
tree23deb7ca13fe969e5966f2e3ca8951fc063fd0f2 /lib/python/Components/FileList.py
parentf488e1db5b364c4df7135008a3b073a1d0ba06ca (diff)
parent7560beb3e371704d798259ca1ea927bf4575306c (diff)
downloadenigma2-18469e4dedcfe75e8128b489774f79fb790a23da.tar.gz
enigma2-18469e4dedcfe75e8128b489774f79fb790a23da.zip
Merge branch 'bug_236_recordpath' into experimental
Diffstat (limited to 'lib/python/Components/FileList.py')
-rwxr-xr-xlib/python/Components/FileList.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index 54bb1acf..a0f66bd1 100755
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -3,7 +3,7 @@ from os import path as os_path, listdir
from MenuList import MenuList
from Components.Harddisk import harddiskmanager
-from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
+from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename, fileExists
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \
eServiceReference, eServiceCenter, gFont
@@ -159,8 +159,11 @@ class FileList(MenuList):
directories.sort()
files.sort()
else:
- if os_path.exists(directory):
- files = listdir(directory)
+ if fileExists(directory):
+ try:
+ files = listdir(directory)
+ except:
+ files = []
files.sort()
tmpfiles = files[:]
for x in tmpfiles:
@@ -373,8 +376,11 @@ class MultiFileSelectList(FileList):
directories.sort()
files.sort()
else:
- if os_path.exists(directory):
- files = listdir(directory)
+ if fileExists(directory):
+ try:
+ files = listdir(directory)
+ except:
+ files = []
files.sort()
tmpfiles = files[:]
for x in tmpfiles: