diff --git a/rpcs3/Emu/VFS.cpp b/rpcs3/Emu/VFS.cpp index ef5a827f5f..86c41a498f 100644 --- a/rpcs3/Emu/VFS.cpp +++ b/rpcs3/Emu/VFS.cpp @@ -71,6 +71,8 @@ bool vfs::mount(std::string_view vpath, std::string_view path, bool is_dir) { // Mounting completed; fixup for directories due to resolve_path messing with trailing / list.back()->path = Emu.GetCallbacks().resolve_path(path); + if (list.back()->path.empty()) + list.back()->path = std::string(path); // Fallback when resolving failed if (is_dir && !list.back()->path.ends_with('/')) list.back()->path += '/'; if (!is_dir && list.back()->path.ends_with('/')) diff --git a/rpcs3/main_application.cpp b/rpcs3/main_application.cpp index f7ddb91252..5f0af7fe2a 100644 --- a/rpcs3/main_application.cpp +++ b/rpcs3/main_application.cpp @@ -327,6 +327,7 @@ EmuCallbacks main_application::CreateCallbacks() callbacks.resolve_path = [](std::string_view sv) { + // May result in an empty string if path does not exist return QFileInfo(QString::fromUtf8(sv.data(), static_cast(sv.size()))).canonicalFilePath().toStdString(); };