Merge branch 'bug_249_current_skin_fallback'

[enigma2.git] / lib / python / Components / FileList.py

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index 0d77553ad0f5969a282e69862101af550352b35b..222512eab861180ef3d26810040442ac4af63b7c 100755 (executable)
--- 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 MenuList import MenuList
 from Components.Harddisk import harddiskmanager
 

-from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename
+from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename, fileExists

 
 from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \
        eServiceReference, eServiceCenter, gFont
 
 from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \
        eServiceReference, eServiceCenter, gFont


@@ -159,8 +159,11 @@ class FileList(MenuList):
                        directories.sort()
                        files.sort()
                else:
                        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:
                                files.sort()
                                tmpfiles = files[:]
                                for x in tmpfiles:


@@ -373,8 +376,11 @@ class MultiFileSelectList(FileList):
                        directories.sort()
                        files.sort()
                else:
                        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:
                                files.sort()
                                tmpfiles = files[:]
                                for x in tmpfiles: