summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-01-14 21:48:01 +0100
committerLiam <byteslice@airmail.cc>2023-01-14 21:48:01 +0100
commit0953cdd271c0a62a9b336e66fa2d5583a633746f (patch)
treeb6f1f24811fd7be52276794b9fd45cc1f01f7cf4 /src/core/hle/kernel
parentMerge pull request #9605 from german77/mouse_mapping (diff)
downloadyuzu-0953cdd271c0a62a9b336e66fa2d5583a633746f.tar
yuzu-0953cdd271c0a62a9b336e66fa2d5583a633746f.tar.gz
yuzu-0953cdd271c0a62a9b336e66fa2d5583a633746f.tar.bz2
yuzu-0953cdd271c0a62a9b336e66fa2d5583a633746f.tar.lz
yuzu-0953cdd271c0a62a9b336e66fa2d5583a633746f.tar.xz
yuzu-0953cdd271c0a62a9b336e66fa2d5583a633746f.tar.zst
yuzu-0953cdd271c0a62a9b336e66fa2d5583a633746f.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/k_hardware_timer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/kernel/k_hardware_timer.cpp b/src/core/hle/kernel/k_hardware_timer.cpp
index 6bba79ea0..4dcd53821 100644
--- a/src/core/hle/kernel/k_hardware_timer.cpp
+++ b/src/core/hle/kernel/k_hardware_timer.cpp
@@ -18,7 +18,8 @@ void KHardwareTimer::Initialize() {
}
void KHardwareTimer::Finalize() {
- this->DisableInterrupt();
+ m_kernel.System().CoreTiming().UnscheduleEvent(m_event_type, reinterpret_cast<uintptr_t>(this));
+ m_wakeup_time = std::numeric_limits<s64>::max();
m_event_type.reset();
}
@@ -59,7 +60,8 @@ void KHardwareTimer::EnableInterrupt(s64 wakeup_time) {
}
void KHardwareTimer::DisableInterrupt() {
- m_kernel.System().CoreTiming().UnscheduleEvent(m_event_type, reinterpret_cast<uintptr_t>(this));
+ m_kernel.System().CoreTiming().UnscheduleEventWithoutWait(m_event_type,
+ reinterpret_cast<uintptr_t>(this));
m_wakeup_time = std::numeric_limits<s64>::max();
}