From fa744121fc936d35b9d880c6bbc587c49aa51b1e Mon Sep 17 00:00:00 2001 From: elad335 <18193363+elad335@users.noreply.github.com> Date: Tue, 13 May 2025 16:27:23 +0300 Subject: [PATCH] Fix CallFromMainThread execution condition --- rpcs3/Emu/System.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index dde9d572f0..3fdcfae9ab 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -169,10 +169,10 @@ void fmt_class_string::format(std::string& out, u64 arg) void Emulator::CallFromMainThread(std::function&& func, atomic_t* wake_up, bool track_emu_state, u64 stop_ctr, std::source_location src_loc) const { - std::function final_func = [this, before = IsStopped(), track_emu_state, thread_name = thread_ctrl::get_name(), src = src_loc + std::function final_func = [this, before = IsStopped(true), track_emu_state, thread_name = thread_ctrl::get_name(), src = src_loc , count = (stop_ctr == umax ? +m_stop_ctr : stop_ctr), func = std::move(func)] { - const bool call_it = (!track_emu_state || (count == m_stop_ctr && before == IsStopped())); + const bool call_it = (!track_emu_state || (count == m_stop_ctr && before == IsStopped(true))); sys_log.trace("Callback from thread '%s' at [%s] is %s", thread_name, src, call_it ? "called" : "skipped");