Fixed|libdeng2: Removing native files

DirectoryFeed now ignores a native file removal request if the file does not exist in the native file system.
skyjake · Dec 16, 2012 · 76c98fc · 76c98fc
1 parent 1e6e5c5
commit 76c98fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doomsday/libdeng2/src/filesys/directoryfeed.cpp b/doomsday/libdeng2/src/filesys/directoryfeed.cpp
@@ -197,10 +197,11 @@ File *DirectoryFeed::newFile(String const &name)
 void DirectoryFeed::removeFile(String const &name)
 {
     NativePath path = _nativePath / name;
+
     if(!exists(path))
     {
-        /// @throw NotFoundError  The file @a name does not exist in the native directory.
-        throw NotFoundError("DirectoryFeed::removeFile", name + ": not found");
+        // The file doesn't exist in the native file system, we can ignore this.
+        return;
     }
 
     if(!QDir::current().remove(path))

diff --git a/doomsday/libdeng2/src/filesys/folder.cpp b/doomsday/libdeng2/src/filesys/folder.cpp
@@ -224,8 +224,7 @@ void Folder::removeFile(String const &removePath)
     if(originFeed)
     {
         originFeed->removeFile(removePath);
-    }
-
+    }    
 }
 
 bool Folder::has(String const &name) const