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

[VFS] Avoid exception on remove/remove_all.

This commit is contained in:
gibbed 2020-11-24 00:22:08 -06:00 committed by Rick Gibbed
parent a4170621a7
commit bda31a443e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xenia/vfs/devices/host_path_entry.cc
View File

@ -97,13 +97,14 @@ std::unique_ptr<Entry> HostPathEntry::CreateEntryInternal(
bool HostPathEntry::DeleteEntryInternal(Entry* entry) { bool HostPathEntry::DeleteEntryInternal(Entry* entry) {
auto full_path = host_path_ / xe::to_path(entry->name()); auto full_path = host_path_ / xe::to_path(entry->name());
std::error_code ec; // avoid exception on remove/remove_all failure
if (entry->attributes() & kFileAttributeDirectory) { if (entry->attributes() & kFileAttributeDirectory) {
// Delete entire directory and contents. // Delete entire directory and contents.
return std::filesystem::remove_all(full_path); return std::filesystem::remove_all(full_path, ec);
} else { } else {
// Delete file. // Delete file.
return !std::filesystem::is_directory(full_path) && return !std::filesystem::is_directory(full_path) &&
std::filesystem::remove(full_path); std::filesystem::remove(full_path, ec);
} }
} }