From 87fc5e4923a22628573f0921d4dd258539f0d2aa Mon Sep 17 00:00:00 2001
From: Eladash <18193363+elad335@users.noreply.github.com>
Date: Sun, 31 Dec 2023 20:27:33 +0200
Subject: [PATCH] Move initialize_timebased_time call to a safer spot

---
 rpcs3/Emu/System.cpp          | 4 ++--
 rpcs3/Emu/savestate_utils.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 148f105fb6..77675b7f45 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -3287,8 +3287,6 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
 		{
 			cpu_thread::cleanup();
 
-			initialize_timebased_time(0, true);
-
 			lv2_obj::cleanup();
 
 			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_pending = false;
 
+			initialize_timebased_time(0, true);
+
 			// Complete the operation
 			m_state = system_state::stopped;
 			GetCallbacks().on_stop();
diff --git a/rpcs3/Emu/savestate_utils.cpp b/rpcs3/Emu/savestate_utils.cpp
index c070283598..74f8b30635 100644
--- a/rpcs3/Emu/savestate_utils.cpp
+++ b/rpcs3/Emu/savestate_utils.cpp
@@ -311,7 +311,7 @@ namespace stx
 		u16 saved = tag;
 		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)
 		{