RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

Fix shutting down emulation while save-stating

Browse Source
This commit is contained in:
Eladash 2024-03-26 17:07:46 +02:00 committed by Elad Ashkenazi
parent e0f08cd5c1
commit 6a3e795d73
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rpcs3/Emu/System.cpp
View File

@ -2759,6 +2759,11 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
auto perform_kill = [read_counter, allow_autoexit, this, info = GetEmulationIdentifier()]() auto perform_kill = [read_counter, allow_autoexit, this, info = GetEmulationIdentifier()]()
{ {
if (m_emu_state_close_pending.exchange(true))
{
return;
}
bool read_sysutil_signal = false; bool read_sysutil_signal = false;
for (u32 i = 100; i < 140; i++) for (u32 i = 100; i < 140; i++)
@ -2781,6 +2786,7 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
if (static_cast<u64>(info) != m_stop_ctr) if (static_cast<u64>(info) != m_stop_ctr)
{ {
m_emu_state_close_pending = false;
return; return;
} }
} }
@ -2788,6 +2794,7 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
// An inevitable attempt to terminate the *current* emulation course will be issued after 7s // An inevitable attempt to terminate the *current* emulation course will be issued after 7s
CallFromMainThread([allow_autoexit, this]() CallFromMainThread([allow_autoexit, this]()
{ {
m_emu_state_close_pending = false;
Kill(allow_autoexit); Kill(allow_autoexit);
}, info); }, info);
}; };
@ -2822,7 +2829,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
{ {
if (!save_stage || !save_stage->prepared) if (!save_stage || !save_stage->prepared)
{ {
if (m_savestate_pending.exchange(true)) if (m_emu_state_close_pending.exchange(true))
{ {
return; return;
} }
@ -2840,7 +2847,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
sys_log.error("Enabling SPU Savestates-Compatible Mode in Advanced tab may fix this."); sys_log.error("Enabling SPU Savestates-Compatible Mode in Advanced tab may fix this.");
} }
m_savestate_pending = false; m_emu_state_close_pending = false;
CallFromMainThread([pause = std::move(pause_thread)]() CallFromMainThread([pause = std::move(pause_thread)]()
{ {
@ -2859,7 +2866,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
"\nYou need to close the game for it to take effect." "\nYou need to close the game for it to take effect."
"\nIf you cannot close the game due to losing important progress, your best chance is to skip the current cutscenes if any are played and retry."); "\nIf you cannot close the game due to losing important progress, your best chance is to skip the current cutscenes if any are played and retry.");
m_savestate_pending = false; m_emu_state_close_pending = false;
CallFromMainThread([pause = std::move(pause_thread)]() CallFromMainThread([pause = std::move(pause_thread)]()
{ {
@ -2891,6 +2898,15 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
return std::string(); return std::string();
}; };
if (save_stage && save_stage->prepared)
{
//
}
else if (m_emu_state_close_pending.exchange(true))
{
return;
}
if (system_state old_state = m_state.fetch_op([](system_state& state) if (system_state old_state = m_state.fetch_op([](system_state& state)
{ {
if (state == system_state::stopping || state == system_state::stopped) if (state == system_state::stopping || state == system_state::stopped)
@ -2922,7 +2938,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
m_config_mode = cfg_mode::custom; m_config_mode = cfg_mode::custom;
read_used_savestate_versions(); read_used_savestate_versions();
m_savestate_extension_flags1 = {}; m_savestate_extension_flags1 = {};
m_savestate_pending = false; m_emu_state_close_pending = false;
// Enable logging // Enable logging
rpcs3::utils::configure_logs(true); rpcs3::utils::configure_logs(true);
@ -3400,7 +3416,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
m_ar.reset(); m_ar.reset();
read_used_savestate_versions(); read_used_savestate_versions();
m_savestate_extension_flags1 = {}; m_savestate_extension_flags1 = {};
m_savestate_pending = false; m_emu_state_close_pending = false;
initialize_timebased_time(0, true); initialize_timebased_time(0, true);

2
rpcs3/Emu/System.h
View File

@ -111,7 +111,7 @@ class Emulator final
atomic_t<u64> m_pause_start_time{0}; // set when paused atomic_t<u64> m_pause_start_time{0}; // set when paused
atomic_t<u64> m_pause_amend_time{0}; // increased when resumed atomic_t<u64> m_pause_amend_time{0}; // increased when resumed
atomic_t<u64> m_stop_ctr{1}; // Increments when emulation is stopped atomic_t<u64> m_stop_ctr{1}; // Increments when emulation is stopped
atomic_t<bool> m_savestate_pending = false; atomic_t<bool> m_emu_state_close_pending = false;
games_config m_games_config; games_config m_games_config;