From aeef2d030d4bdd5935909f567a18d829e16342fb Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 20 May 2025 21:03:19 +0200 Subject: [PATCH] SDL: do not track emu state when initializing --- rpcs3/Emu/System.cpp | 4 ++-- rpcs3/Emu/System.h | 2 +- rpcs3/Input/sdl_instance.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 3fdcfae9ab..002075b5fa 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -185,13 +185,13 @@ void Emulator::CallFromMainThread(std::function&& func, atomic_t* w m_cb.call_from_main_thread(std::move(final_func), wake_up); } -void Emulator::BlockingCallFromMainThread(std::function&& func, std::source_location src_loc) const +void Emulator::BlockingCallFromMainThread(std::function&& func, bool track_emu_state, std::source_location src_loc) const { atomic_t wake_up = 0; sys_log.trace("Blocking Callback from thread '%s' at [%s] is queued", thread_ctrl::get_name(), src_loc); - CallFromMainThread(std::move(func), &wake_up, true, umax, src_loc); + CallFromMainThread(std::move(func), &wake_up, track_emu_state, umax, src_loc); bool logged = false; diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 036215870f..417bef41b8 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -210,7 +210,7 @@ public: std::source_location src_loc = std::source_location::current()) const; // Blocking call from the GUI thread - void BlockingCallFromMainThread(std::function&& func, std::source_location src_loc = std::source_location::current()) const; + void BlockingCallFromMainThread(std::function&& func, bool track_emu_state = true, std::source_location src_loc = std::source_location::current()) const; enum class stop_counter_t : u64{}; diff --git a/rpcs3/Input/sdl_instance.cpp b/rpcs3/Input/sdl_instance.cpp index 4fbbfc9dc6..879333b513 100644 --- a/rpcs3/Input/sdl_instance.cpp +++ b/rpcs3/Input/sdl_instance.cpp @@ -63,7 +63,7 @@ bool sdl_instance::initialize() Emu.BlockingCallFromMainThread([this, &instance_success]() { instance_success = initialize_impl(); - }); + }, false); return instance_success; }