RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-07 23:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve Restart function

Browse source 
Don't erase boot args
Should now work correctly with game launchers
This commit is contained in:
Nekotekina 2018-01-03 00:45:52 +03:00
parent 7050575fdb
commit af3e1fc580
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/System.cpp
View file

@ -920,7 +920,7 @@ void Emulator::Resume()
GetCallbacks().on_resume();
}
void Emulator::Stop()
void Emulator::Stop(bool restart)
{
if (m_state.exchange(system_state::stopped) == system_state::stopped)
{
@ -928,7 +928,7 @@ void Emulator::Stop()
return;
}
const bool do_exit = !m_force_boot && g_cfg.misc.autoexit;
const bool do_exit = !restart && !m_force_boot && g_cfg.misc.autoexit;
LOG_NOTICE(GENERAL, "Stopping emulator...");
@ -992,6 +992,12 @@ void Emulator::Stop()
jit_finalize();
#endif
if (restart)
{
return Load();
}
// Boot arg cleanup (preserved in the case restarting)
argv.clear();
envp.clear();
data.clear();

3
rpcs3/Emu/System.h
View file

@ -262,7 +262,8 @@ public:
void Run();
bool Pause();
void Resume();
void Stop();
void Stop(bool restart = false);
void Restart() { Stop(true); }
bool IsRunning() const { return m_state == system_state::running; }
bool IsPaused() const { return m_state == system_state::paused; }