Merge pull request #5980 from JosJuice/copydir-destructive

Fix regression in File::CopyDir
dolphin-emu · Aug 25, 2017 · a861c57 · a861c57
2 parents d1223b6 + 87d9829
commit a861c57
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
@@ -564,11 +564,11 @@ void CopyDir(const std::string& source_path, const std::string& dest_path, bool
         File::CreateFullPath(dest + DIR_SEP);
       CopyDir(source, dest, destructive);
     }
-    else if (!Exists(dest) && !destructive)
+    else if (!destructive && !Exists(dest))
     {
       Copy(source, dest);
     }
-    else
+    else if (destructive)
     {
       Rename(source, dest);
     }