summaryrefslogtreecommitdiffstats
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-12-23 20:06:41 +0100
committerLiam <byteslice@airmail.cc>2023-12-23 21:36:46 +0100
commit575db0417278eef0c854900885734fd068b97430 (patch)
tree6663a52529852ca1279b7461807e3beb8ed312af /src/core/core_timing.cpp
parentcore_timing: remove user data value (diff)
downloadyuzu-575db0417278eef0c854900885734fd068b97430.tar
yuzu-575db0417278eef0c854900885734fd068b97430.tar.gz
yuzu-575db0417278eef0c854900885734fd068b97430.tar.bz2
yuzu-575db0417278eef0c854900885734fd068b97430.tar.lz
yuzu-575db0417278eef0c854900885734fd068b97430.tar.xz
yuzu-575db0417278eef0c854900885734fd068b97430.tar.zst
yuzu-575db0417278eef0c854900885734fd068b97430.zip
Diffstat (limited to '')
-rw-r--r--src/core/core_timing.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 3b7b0aa45..d08c007bb 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -143,7 +143,8 @@ void CoreTiming::ScheduleLoopingEvent(std::chrono::nanoseconds start_time,
event.Set();
}
-void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type, bool wait) {
+void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
+ UnscheduleEventType type) {
{
std::scoped_lock lk{basic_lock};
@@ -161,7 +162,7 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type, b
}
// Force any in-progress events to finish
- if (wait) {
+ if (type == UnscheduleEventType::Wait) {
std::scoped_lock lk{advance_lock};
}
}