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

Fix Boot inconsistencies for Reloads

Browse source
This commit is contained in:
Megamouse 2020-02-08 09:42:05 +01:00
parent 901fc87bca
commit 7abda27b46
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/System.cpp
View file

@ -1223,7 +1223,7 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
if (fs::rename(elf_dir + "/../../", hdd0_disc + elf_dir.substr(hdd0_game.size()) + "/../../", false)) if (fs::rename(elf_dir + "/../../", hdd0_disc + elf_dir.substr(hdd0_game.size()) + "/../../", false))
{ {
sys_log.success("Disc game %s moved to special location /dev_hdd0/disc/", m_title_id); sys_log.success("Disc game %s moved to special location /dev_hdd0/disc/", m_title_id);
return m_path = hdd0_disc + m_path.substr(hdd0_game.size()), Load(); return m_path = hdd0_disc + m_path.substr(hdd0_game.size()), Load(m_title_id, add_only, force_global_config);
} }
else else
{ {
@ -1422,7 +1422,7 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
{ {
// Booting game update // Booting game update
sys_log.success("Updates found at /dev_hdd0/game/%s/!", m_title_id); sys_log.success("Updates found at /dev_hdd0/game/%s/!", m_title_id);
return m_path = hdd0_boot, Load(); return m_path = hdd0_boot, Load(m_title_id, false, force_global_config);
} }
// Set title to actual disc title if necessary // Set title to actual disc title if necessary
@ -1639,6 +1639,8 @@ void Emulator::Run(bool start_playtime)
{ {
if (!IsReady()) if (!IsReady())
{ {
// Reload with global configuration.
// TODO: Discuss if this should use the prior configuration instead.
Load(); Load();
if (!IsReady()) if (!IsReady())
@ -1797,6 +1799,8 @@ void Emulator::Stop(bool restart)
{ {
if (restart) if (restart)
{ {
// Reload with global configuration.
// TODO: Discuss if this should use the prior configuration instead.
return Load(); return Load();
} }
@ -1841,6 +1845,8 @@ void Emulator::Stop(bool restart)
if (restart) if (restart)
{ {
// Reload with global configuration.
// TODO: Discuss if this should use the prior configuration instead.
return Load(); return Load();
} }