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

Restart games with the same config instead of global

Browse source
This commit is contained in:
Megamouse 2020-02-08 10:02:27 +01:00
parent 7abda27b46
commit 5dcb91b671
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rpcs3/Emu/System.cpp
View file

@ -925,6 +925,8 @@ void Emulator::SetForceBoot(bool force_boot)
void Emulator::Load(const std::string& title_id, bool add_only, bool force_global_config) void Emulator::Load(const std::string& title_id, bool add_only, bool force_global_config)
{ {
m_force_global_config = force_global_config;
if (!IsStopped()) if (!IsStopped())
{ {
Stop(); Stop();
@ -1639,9 +1641,8 @@ void Emulator::Run(bool start_playtime)
{ {
if (!IsReady()) if (!IsReady())
{ {
// Reload with global configuration. // Reload with prior configuration.
// TODO: Discuss if this should use the prior configuration instead. Load(m_title_id, false, m_force_global_config);
Load();
if (!IsReady()) if (!IsReady())
{ {
@ -1799,9 +1800,8 @@ void Emulator::Stop(bool restart)
{ {
if (restart) if (restart)
{ {
// Reload with global configuration. // Reload with prior configs.
// TODO: Discuss if this should use the prior configuration instead. return Load(m_title_id, false, m_force_global_config);
return Load();
} }
m_force_boot = false; m_force_boot = false;
@ -1845,9 +1845,8 @@ void Emulator::Stop(bool restart)
if (restart) if (restart)
{ {
// Reload with global configuration. // Reload with prior configs.
// TODO: Discuss if this should use the prior configuration instead. return Load(m_title_id, false, m_force_global_config);
return Load();
} }
// Boot arg cleanup (preserved in the case restarting) // Boot arg cleanup (preserved in the case restarting)

1
rpcs3/Emu/System.h
View file

@ -249,6 +249,7 @@ class Emulator final
std::string m_usr{"00000001"}; std::string m_usr{"00000001"};
u32 m_usrid{1}; u32 m_usrid{1};
bool m_force_global_config = false;
bool m_force_boot = false; bool m_force_boot = false;
bool m_has_gui = true; bool m_has_gui = true;