Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

core_timing: block advance thread while clearing and signal after

Liam0865db645efe
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index c85590d4c5..fc536413b7 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -72,8 +72,9 @@ void CoreTiming::Initialize(std::function<void()>&& on_thread_init_) {
}
void CoreTiming::ClearPendingEvents() {
- std::scoped_lock lock{basic_lock};
+ std::scoped_lock lock{advance_lock, basic_lock};
event_queue.clear();
+ event.Set();
}
void CoreTiming::Pause(bool is_paused) {