X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/36adf5ca9728a2edc5b1e19bf98e95006a68bcc0..ab40b0a5518886c7aa94458425bdec90d5430ee9:/lib/python/Components/FileList.py

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index 54bb1acf..b187ee3e 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
@@ -23,6 +23,7 @@ EXTENSIONS = {
 		"ts": "movie",
 		"avi": "movie",
 		"divx": "movie",
+		"m4v": "movie",
 		"mpg": "movie",
 		"mpeg": "movie",
 		"mkv": "movie",
@@ -159,8 +160,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 +377,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: