mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-05 00:36:57 +00:00
Add kListAllNoRoot type to listDir() to handle recent file class changes, on file system backends which use _isPseudoRoot
svn-id: r21449
This commit is contained in:
parent
737c52590b
commit
a98aea6efd
@ -99,7 +99,8 @@ public:
|
||||
typedef enum {
|
||||
kListFilesOnly = 1,
|
||||
kListDirectoriesOnly = 2,
|
||||
kListAll = 3
|
||||
kListAllNoRoot = 3,
|
||||
kListAll = 4
|
||||
} ListMode;
|
||||
|
||||
virtual ~AbstractFilesystemNode() {}
|
||||
|
@ -109,7 +109,7 @@ FSList SymbianFilesystemNode::listDir(ListMode mode) const {
|
||||
assert(_isDirectory);
|
||||
FSList myList;
|
||||
|
||||
if (_isPseudoRoot) {
|
||||
if (_isPseudoRoot && mode != kListAllNoRoot) {
|
||||
// Drives enumeration
|
||||
RFs fs = CEikonEnv::Static()->FsSession();
|
||||
TInt driveNumber;
|
||||
|
@ -174,7 +174,7 @@ FSList WindowsFilesystemNode::listDir(ListMode mode) const {
|
||||
|
||||
FSList myList;
|
||||
|
||||
if (_isPseudoRoot) {
|
||||
if (_isPseudoRoot && mode != kListAllNoRoot) {
|
||||
#ifndef _WIN32_WCE
|
||||
// Drives enumeration
|
||||
TCHAR drive_buffer[100];
|
||||
|
@ -159,7 +159,7 @@ void File::addDefaultDirectoryRecursive(const String &directory, int level, int
|
||||
baseLen++;
|
||||
}
|
||||
|
||||
FSList fslist(dir.listDir(FilesystemNode::kListAll));
|
||||
FSList fslist(dir.listDir(FilesystemNode::kListAllNoRoot));
|
||||
|
||||
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
|
||||
if (file->isDirectory()) {
|
||||
|
Loading…
Reference in New Issue
Block a user