Merge pull request #34 from isanae/deletion-mapping

Don't map files that don't exist when deleting them
ModOrganizer2 · Aug 13, 2020 · 7454a09 · 7454a09
2 parents 4f617f9 + 6acd543
commit 7454a09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/include/usvfs_version.h b/include/usvfs_version.h
@@ -3,7 +3,7 @@
 #define USVFS_VERSION_MAJOR 0
 #define USVFS_VERSION_MINOR 4
 #define USVFS_VERSION_BUILD 4
-#define USVFS_VERSION_REVISION 7
+#define USVFS_VERSION_REVISION 8
 
 #define USVFS_BUILD_STRING ""
 #define USVFS_BUILD_WSTRING L""

diff --git a/src/usvfs_dll/hooks/kernel32.cpp b/src/usvfs_dll/hooks/kernel32.cpp
@@ -524,7 +524,10 @@ BOOL WINAPI usvfs::hook_DeleteFileW(LPCWSTR lpFileName)
   }
   POST_REALCALL
 
-  reroute.removeMapping(READ_CONTEXT());
+  if (res) {
+    reroute.removeMapping(READ_CONTEXT());
+  }
+
   if (reroute.wasRerouted())
     LOG_CALL().PARAMWRAP(lpFileName).PARAMWRAP(reroute.fileName()).PARAM(res).PARAM(callContext.lastError());
 
@@ -1137,7 +1140,10 @@ DLLEXPORT BOOL WINAPI usvfs::hook_RemoveDirectoryW(
   }
   POST_REALCALL
 
-  reroute.removeMapping(READ_CONTEXT(), true);
+  if (res) {
+    reroute.removeMapping(READ_CONTEXT(), true);
+  }
+
   if (reroute.wasRerouted())
     LOG_CALL().PARAMWRAP(lpPathName).PARAMWRAP(reroute.fileName()).PARAM(res).PARAM(callContext.lastError());