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

Emu: always use Emu.Quit() to quit RPCS3

Browse source 
This creates a single possible point of failure for calling quit()
This commit is contained in:
Megamouse 2020-07-03 17:11:28 +02:00
parent 332f9cae77
commit d91551c277
5 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

31
rpcs3/Emu/System.cpp
View file

@ -1752,19 +1752,6 @@ void Emulator::Stop(bool restart)
vm::close();
if (do_exit)
{
GetCallbacks().exit(true);
}
else
{
if (full_stop)
{
GetCallbacks().exit(false);
}
Init();
}
#ifdef LLVM_AVAILABLE
extern void jit_finalize();
jit_finalize();
@ -1793,6 +1780,24 @@ void Emulator::Stop(bool restart)
{
enable_display_sleep();
}
if (do_exit || full_stop)
{
if (Quit(do_exit))
{
return;
}
}
Init();
}
bool Emulator::Quit(bool force_quit) const
{
Emu.SetForceBoot(false);
Emu.Stop();
return GetCallbacks().exit(force_quit);
}
std::string Emulator::GetFormattedTitle(double fps) const