Merge pull request #5980 from JosJuice/copydir-destructive

Fix regression in File::CopyDir
2017-08-25 10:35:36 -07:00 · 2017-08-25 10:35:36 -07:00 · a861c5772d
parent d1223b6472 87d982982d
commit a861c5772d
1 changed files with 2 additions and 2 deletions
--- 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);
    }