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

Move initialize_timebased_time call to a safer spot

Browse source
This commit is contained in:
Eladash 2023-12-31 20:27:33 +02:00 • committed by Elad Ashkenazi
parent e6f1e598a9
commit 87fc5e4923
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/System.cpp
View file

@ -3287,8 +3287,6 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
{ {
cpu_thread::cleanup(); cpu_thread::cleanup();
initialize_timebased_time(0, true);
lv2_obj::cleanup(); lv2_obj::cleanup();
g_fxo->reset(); g_fxo->reset();
@ -3342,6 +3340,8 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
m_savestate_extension_flags1 = {}; m_savestate_extension_flags1 = {};
m_savestate_pending = false; m_savestate_pending = false;
initialize_timebased_time(0, true);
// Complete the operation // Complete the operation
m_state = system_state::stopped; m_state = system_state::stopped;
GetCallbacks().on_stop(); GetCallbacks().on_stop();

2
rpcs3/Emu/savestate_utils.cpp
View file

@ -311,7 +311,7 @@ namespace stx
u16 saved = tag; u16 saved = tag;
ar(saved); ar(saved);
sys_log.trace("serial_breathe_and_tag(): %s, object: '%s', next-object: '%s', expected/tag: 0x%x == 0x%x", ar, s_tls_object_name, name, tag, saved); sys_log.warning("serial_breathe_and_tag(): %s, object: '%s', next-object: '%s', expected/tag: 0x%x == 0x%x", ar, s_tls_object_name, name, tag, saved);
if ((saved ^ tag) & data_mask) if ((saved ^ tag) & data_mask)
{ {