aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorTravis Howell2006-03-25 10:39:05 +0000
committerTravis Howell2006-03-25 10:39:05 +0000
commita98aea6efd08840fed7fc2bd2e5d2826eb5e4897 (patch)
tree557d59963a3bac53b839f5505a11fe190514eea9 /backends
parent737c52590b3ae1d19a1fc193f143e58dea670886 (diff)
downloadscummvm-rg350-a98aea6efd08840fed7fc2bd2e5d2826eb5e4897.tar.gz
scummvm-rg350-a98aea6efd08840fed7fc2bd2e5d2826eb5e4897.tar.bz2
scummvm-rg350-a98aea6efd08840fed7fc2bd2e5d2826eb5e4897.zip
Add kListAllNoRoot type to listDir() to handle recent file class changes, on file system backends which use _isPseudoRoot
svn-id: r21449
Diffstat (limited to 'backends')
-rw-r--r--backends/fs/fs.h3
-rw-r--r--backends/fs/symbian/symbian-fs.cpp2
-rw-r--r--backends/fs/windows/windows-fs.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/backends/fs/fs.h b/backends/fs/fs.h
index 1181e69723..6ad51762ca 100644
--- a/backends/fs/fs.h
+++ b/backends/fs/fs.h
@@ -99,7 +99,8 @@ public:
typedef enum {
kListFilesOnly = 1,
kListDirectoriesOnly = 2,
- kListAll = 3
+ kListAllNoRoot = 3,
+ kListAll = 4
} ListMode;
virtual ~AbstractFilesystemNode() {}
diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp
index 0e9cbba86c..bf5f9e2b82 100644
--- a/backends/fs/symbian/symbian-fs.cpp
+++ b/backends/fs/symbian/symbian-fs.cpp
@@ -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;
diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp
index 4b1f671916..b7a22a301f 100644
--- a/backends/fs/windows/windows-fs.cpp
+++ b/backends/fs/windows/windows-fs.cpp
@@ -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];