piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6789 from leoetlino/rename-bug

Browse Source 
IOS/FS: Fix rename not handling existing target correctly
This commit is contained in:
Léo Lam
2018-05-09 19:07:39 +02:00
committed by GitHub
parent 1016674242 7feabcd096
commit 274f418f4b
2 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/IOS/FS/HostBackend/FS.cpp
View File

@ -232,10 +232,17 @@ ResultCode HostFileSystem::Rename(Uid, Gid, const std::string& old_path,
// try to make the basis directory
File::CreateFullPath(new_name);
// if there is already a file, delete it
if (File::Exists(old_name) && File::Exists(new_name))
// If there is already something of the same type at the new path, delete it.
if (File::Exists(new_name))
{
File::Delete(new_name);
const bool old_is_file = File::IsFile(old_name);
const bool new_is_file = File::IsFile(new_name);
if (old_is_file && new_is_file)
File::Delete(new_name);
else if (!old_is_file && !new_is_file)
File::DeleteDirRecursively(new_name);
else
return ResultCode::Invalid;
}
// finally try to rename the file