Added alternate file rename strategy for when MoveFile fails with acc…

…ess denied
multitheftauto · Mar 7, 2019 · e9ce827 · e9ce827
1 parent 3a7c803
commit e9ce827
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/Shared/sdk/SharedUtil.File.hpp b/Shared/sdk/SharedUtil.File.hpp
@@ -91,8 +91,18 @@ bool SharedUtil::FileRename(const SString& strFilenameOld, const SString& strFil
 #ifdef WIN32
     if (MoveFileExW(FromUTF8(strFilenameOld), FromUTF8(strFilenameNew), MOVEFILE_COPY_ALLOWED) == 0)
     {
+        int errorCode = GetLastError();
+        if (errorCode == ERROR_ACCESS_DENIED)
+        {
+            // Try alternate rename strategy
+            if (!FileExists(strFilenameNew) && FileCopy(strFilenameOld, strFilenameNew))
+            {
+                FileDelete(strFilenameOld);
+                return true;
+            }
+        }
         if (pOutErrorCode)
-            *pOutErrorCode = GetLastError();
+            *pOutErrorCode = errorCode;
         return false;
     }
     return true;