diff options
| -rw-r--r-- | common/archive.cpp | 7 | ||||
| -rw-r--r-- | common/archive.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/common/archive.cpp b/common/archive.cpp index 575fa3857d..bdea62b895 100644 --- a/common/archive.cpp +++ b/common/archive.cpp @@ -93,14 +93,13 @@ SeekableReadStream *FSDirectory::openFile(const String &name) { return stream; } -SharedPtr<FSDirectory> FSDirectory::getSubDirectory(const String &name) { +FSDirectory *FSDirectory::getSubDirectory(const String &name) { if (name.empty() || !_node.isDirectory()) { - // return a null SharedPtr - return SharedPtr<FSDirectory>(); + return 0; } FilesystemNode node = lookupCache(_subDirCache, name); - return SharedPtr<FSDirectory>(new FSDirectory(node)); + return new FSDirectory(node); } void FSDirectory::cacheDirectoryRecursive(FilesystemNode node, int depth, const String& prefix) { diff --git a/common/archive.h b/common/archive.h index e6a4728312..97eaf801a7 100644 --- a/common/archive.h +++ b/common/archive.h @@ -136,7 +136,7 @@ public: * Create a new FSDirectory pointing to a sub directory of the instance. * @return A new FSDirectory instance conveniently wrapped in a SharedPtr. */ - SharedPtr<FSDirectory> getSubDirectory(const String &name); + FSDirectory *getSubDirectory(const String &name); virtual bool hasFile(const String &name); virtual int matchPattern(StringList &list, const String &pattern); |