ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression in File::CopyDir 

This apparently fixes https://bugs.dolphin-emu.org/issues/10499 somehow.

The first changed line of this commit is just for performance - the
second changed line is where the difference in behavior is.
This commit is contained in:
JosJuice 2017-08-25 19:10:13 +02:00
parent d1223b6472
commit 87d982982d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/FileUtil.cpp
View File

@ -564,11 +564,11 @@ void CopyDir(const std::string& source_path, const std::string& dest_path, bool
File::CreateFullPath(dest + DIR_SEP); File::CreateFullPath(dest + DIR_SEP);
CopyDir(source, dest, destructive); CopyDir(source, dest, destructive);
} }
else if (!Exists(dest) && !destructive) else if (!destructive && !Exists(dest))
{ {
Copy(source, dest); Copy(source, dest);
} }
else else if (destructive)
{ {
Rename(source, dest); Rename(source, dest);
} }