dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-04 22:25:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

ISO: reset m_path to original path during Restart

Browse Source
This commit is contained in:
Megamouse 2026-01-12 01:29:46 +01:00
parent 100a402cd8
commit cf94be2aac
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpcs3/Emu/System.cpp
View File

@ -844,6 +844,7 @@ bool Emulator::BootRsxCapture(const std::string& path)
m_path.clear(); m_path.clear();
m_path_old.clear(); m_path_old.clear();
m_path_original.clear(); m_path_original.clear();
m_path_real.clear();
m_title_id.clear(); m_title_id.clear();
m_title.clear(); m_title.clear();
m_localized_title.clear(); m_localized_title.clear();
@ -1460,7 +1461,8 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
path = path + "PS3_GAME/USRDIR/EBOOT.BIN"; path = path + "PS3_GAME/USRDIR/EBOOT.BIN";
} }
m_path = path; m_path_real = m_path;
m_path = std::move(path);
} }
sys_log.notice("Load: is iso archive = %d (m_path='%s')", launching_from_disc_archive, m_path); sys_log.notice("Load: is iso archive = %d (m_path='%s')", launching_from_disc_archive, m_path);
@ -3980,6 +3982,15 @@ game_boot_result Emulator::Restart(bool graceful)
Emu.after_kill_callback = [this] Emu.after_kill_callback = [this]
{ {
// Reset boot path in case of ISO
if (m_path.starts_with(iso_device::virtual_device_name))
{
sys_log.notice("Continuous boot: Resetting boot path from '%s' to '%s'", m_path, m_path_real);
ensure(!m_path_real.empty());
ensure(!m_path_real.starts_with(iso_device::virtual_device_name));
m_path = m_path_real;
}
// Reload with prior configs. // Reload with prior configs.
if (const auto error = Load(m_title_id); error != game_boot_result::no_errors) if (const auto error = Load(m_title_id); error != game_boot_result::no_errors)
{ {

1
rpcs3/Emu/System.h
View File

@ -148,6 +148,7 @@ class Emulator final
std::string m_path; std::string m_path;
std::string m_path_old; std::string m_path_old;
std::string m_path_original; std::string m_path_original;
std::string m_path_real;
std::string m_title_id; std::string m_title_id;
std::string m_title; std::string m_title;
std::string m_localized_title; std::string m_localized_title;