From 33371473fe41fb75d2d0dd35182ca3873cbbe9d5 Mon Sep 17 00:00:00 2001 From: Functionable <40835042+Functionable@users.noreply.github.com> Date: Sun, 14 Dec 2025 13:08:34 +0000 Subject: [PATCH] ISO: Remove resolve_path hack - Modify Emulator::GetFakeCat to return "DG" for mounted ISO games like expected. - Undo changes to main_application resolve_path callback --- rpcs3/Emu/System.cpp | 2 +- rpcs3/main_application.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 0325807e1e..8cd25fdf35 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -4387,7 +4387,7 @@ const std::string& Emulator::GetFakeCat() const { const std::string mount_point = vfs::get("/dev_bdvd"); - if (mount_point.empty() || !IsPathInsideDir(m_path, mount_point)) + if (mount_point.empty() || (!IsPathInsideDir(m_path, mount_point) && !m_path.starts_with(iso_device::virtual_device_name))) { static const std::string s_hg = "HG"; return s_hg; diff --git a/rpcs3/main_application.cpp b/rpcs3/main_application.cpp index a7a33f471f..a1bc443cd0 100644 --- a/rpcs3/main_application.cpp +++ b/rpcs3/main_application.cpp @@ -343,8 +343,7 @@ EmuCallbacks main_application::CreateCallbacks() callbacks.resolve_path = [](std::string_view sv) { // May result in an empty string if path does not exist - std::string result = QFileInfo(QString::fromUtf8(sv.data(), static_cast(sv.size()))).canonicalFilePath().toStdString(); - return !result.empty() ? result : std::string(sv); + return QFileInfo(QString::fromUtf8(sv.data(), static_cast(sv.size()))).canonicalFilePath().toStdString(); }; callbacks.get_font_dirs = []()