archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 22:41:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reapply VFS change

Browse source
This commit is contained in:
raven02 2014-12-21 07:32:19 +08:00
parent 0506bf0352
commit c6a00e157d
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/Emu/FS/VFS.cpp
View file

@ -32,21 +32,12 @@ std::string simplify_path(const std::string& path, bool is_dir)
{ {
std::vector<std::string> path_blocks = simplify_path_blocks(path); std::vector<std::string> path_blocks = simplify_path_blocks(path);
std::string result;
if (path_blocks.empty()) if (path_blocks.empty())
return result; return "";
if (is_dir) std::string result = fmt::merge(path_blocks, "/");
{
result = fmt::merge(path_blocks, "/");
}
else
{
result = fmt::merge(std::vector<std::string>(path_blocks.begin(), path_blocks.end() - 1), "/") + path_blocks[path_blocks.size() - 1];
}
return result; return is_dir ? result + "/" : result;
} }
VFS::~VFS() VFS::~VFS()