mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 11:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixup after #6329

Browse source
This commit is contained in:
Eladash 2019-08-12 15:35:57 +03:00 • committed by Ivan
parent a4896eb6df
commit 95f22b76c6
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Utilities/File.cpp
View file

@ -1541,30 +1541,37 @@ const std::string& fs::get_cache_dir()
bool fs::remove_all(const std::string& path, bool remove_root)
{
for (const auto& entry : dir(path))
if (const auto root_dir = dir(path))
{
if (entry.name == "." || entry.name == "..")
for (const auto& entry : root_dir)
{
continue;
}
if (entry.is_directory == false)
{
if (!remove_file(path + '/' + entry.name))
if (entry.name == "." || entry.name == "..")
{
return false;
continue;
}
}
if (entry.is_directory == true)
{
if (!remove_all(path + '/' + entry.name))
if (entry.is_directory == false)
{
return false;
if (!remove_file(path + '/' + entry.name))
{
return false;
}
}
if (entry.is_directory == true)
{
if (!remove_all(path + '/' + entry.name))
{
return false;
}
}
}
}
else
{
return false;
}
if (remove_root)
{
return remove_dir(path);