Merge pull request #5980 from JosJuice/copydir-destructive

Fix regression in File::CopyDir
This commit is contained in:
Anthony 2017-08-25 10:35:36 -07:00 committed by GitHub
commit a861c5772d

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);
} }