Merge

1 files changed, 9 insertions, 7 deletions

diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index 76912b66..802c3696 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -704,11 +704,12 @@ const FileEntry::Ptr DirectoryEntry::searchFile(const std::wstring &path, const
     *directory = NULL;

   }

 

-  if ((path.length() == 0) ||

-      (path == L"*")) {

+  if ((path.length() == 0) || (path == L"*")) {

     // no file name -> the path ended on a (back-)slash

-    *directory = this;

-    return NULL;

+    if (directory != NULL) {

+      *directory = this;

+    }

+    return FileEntry::Ptr();

   }

 

   size_t len =  path.find_first_of(L"\\/");

@@ -732,9 +733,10 @@ const FileEntry::Ptr DirectoryEntry::searchFile(const std::wstring &path, const
       return temp->searchFile(path.substr(len + 1), directory);

     }

   }

-  return NULL;

+  return FileEntry::Ptr();

 }

 

+

 DirectoryEntry *DirectoryEntry::findSubDirectory(const std::wstring &name) const

 {

   for (std::vector<DirectoryEntry*>::const_iterator iter = m_SubDirectories.begin(); iter != m_SubDirectories.end(); ++iter) {

@@ -752,7 +754,7 @@ const FileEntry::Ptr DirectoryEntry::findFile(const std::wstring &name)
   if (iter != m_Files.end()) {

     return m_FileRegister->getFile(iter->second);

   } else {

-    return NULL;

+    return FileEntry::Ptr();

   }

 }

 

@@ -833,7 +835,7 @@ FileEntry::Ptr FileRegister::getFile(FileEntry::Index index)
   if (iter != m_Files.end()) {

     return iter->second;

   }

-  return NULL;

+  return FileEntry::Ptr();

 }