diff options
| author | Travis Howell | 2006-04-27 23:14:54 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-27 23:14:54 +0000 |
| commit | e163be131c191f3e04ae120690b0d0926deeb25f (patch) | |
| tree | f573e9d2d06a12088d3b40b93155ca1f20356038 | |
| parent | 6330e6585225c40b63818eb3ee608b144704493f (diff) | |
| download | scummvm-rg350-e163be131c191f3e04ae120690b0d0926deeb25f.tar.gz scummvm-rg350-e163be131c191f3e04ae120690b0d0926deeb25f.tar.bz2 scummvm-rg350-e163be131c191f3e04ae120690b0d0926deeb25f.zip | |
Revert kListAllNoRoot addition to listdir(), the uninitialized _isPseudoRoot in windows filesys backend was real cause of problem.
svn-id: r22194
| -rw-r--r-- | backends/fs/fs.h | 3 | ||||
| -rw-r--r-- | backends/fs/symbian/symbian-fs.cpp | 2 | ||||
| -rw-r--r-- | backends/fs/windows/windows-fs.cpp | 2 | ||||
| -rw-r--r-- | common/file.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/backends/fs/fs.h b/backends/fs/fs.h index 27f8c7679f..0c9d94e782 100644 --- a/backends/fs/fs.h +++ b/backends/fs/fs.h @@ -98,8 +98,7 @@ public: typedef enum { kListFilesOnly = 1, kListDirectoriesOnly = 2, - kListAllNoRoot = 3, - kListAll = 4 + kListAll = 3 } ListMode; virtual ~AbstractFilesystemNode() {} diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp index a5bf1f722f..30439e0cdc 100644 --- a/backends/fs/symbian/symbian-fs.cpp +++ b/backends/fs/symbian/symbian-fs.cpp @@ -103,7 +103,7 @@ FSList SymbianFilesystemNode::listDir(ListMode mode) const { assert(_isDirectory); FSList myList; - if (_isPseudoRoot && mode != kListAllNoRoot) { + if (_isPseudoRoot) { // Drives enumeration RFs fs = CEikonEnv::Static()->FsSession(); TInt driveNumber; diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index 837fed1e72..f776ffc8fe 100644 --- a/backends/fs/windows/windows-fs.cpp +++ b/backends/fs/windows/windows-fs.cpp @@ -169,7 +169,7 @@ FSList WindowsFilesystemNode::listDir(ListMode mode) const { FSList myList; - if (_isPseudoRoot && mode != kListAllNoRoot) { + if (_isPseudoRoot) { #ifndef _WIN32_WCE // Drives enumeration TCHAR drive_buffer[100]; diff --git a/common/file.cpp b/common/file.cpp index f7632b0b75..d3f6c94a81 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -133,7 +133,7 @@ void File::addDefaultDirectoryRecursive(const String &directory, int level) { if (!_filesMap) _filesMap = new FilesMap; - const FSList fslist(dir.listDir(FilesystemNode::kListAllNoRoot)); + const FSList fslist(dir.listDir(FilesystemNode::kListAll)); for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { if (file->isDirectory()) { |