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

HLE linkage rewritten

Browse source
This commit is contained in:
Nekotekina 2017-04-13 02:31:42 +03:00
parent 14f02b23c2
commit 7428bb3025
8 changed files with 163 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/System.cpp
View file

@ -363,7 +363,15 @@ void Emulator::Load()
}
debug::autopause::reload();
if (g_cfg_autostart) Run();
if (g_cfg_autostart && IsReady())
{
Run();
}
else if (IsPaused())
{
m_status = Ready;
}
}
catch (const std::exception& e)
{
@ -412,7 +420,7 @@ bool Emulator::Pause()
// Try to pause
if (!m_status.compare_and_swap_test(Running, Paused))
{
return false;
return m_status.compare_and_swap_test(Ready, Paused);
}
rpcs3::on_pause()();