properly handle: non-accessible directories, 'None' (=list of mountpoints) with showM...
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 9 Feb 2009 14:09:32 +0000 (15:09 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 9 Feb 2009 14:09:32 +0000 (15:09 +0100)
lib/python/Components/FileList.py

index a93d444..84abf32 100644 (file)
@@ -119,8 +119,6 @@ class FileList(MenuList):
        def changeDir(self, directory, select = None):
                self.list = []
 
-               if directory and not os_path.isdir(directory):
-                       directory = None
                # if we are just entering from the list of mount points:
                if self.current_directory is None:
                        if directory and self.showMountpoints:
@@ -138,6 +136,9 @@ class FileList(MenuList):
                                        self.list.append(FileEntryComponent(name = p.description, absolute = path, isDir = True))
                        files = [ ]
                        directories = [ ]
+               elif directory is None:
+                       files = [ ]
+                       directories = [ ]
                elif self.useServiceRef:
                        root = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + directory)
                        if self.additional_extensions: