diff options
author | Liam <byteslice@airmail.cc> | 2023-08-15 00:12:06 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-08-15 00:12:06 +0200 |
commit | 0bd9a4456c49b1e5de8f659682a814bb4b5854d2 (patch) | |
tree | 1a9575d019cbab012f2dd3f56675be604737f79a /src/core/hle/kernel/svc/svc_condition_variable.cpp | |
parent | Merge pull request #11282 from ameerj/glasm-xfb (diff) | |
download | yuzu-0bd9a4456c49b1e5de8f659682a814bb4b5854d2.tar yuzu-0bd9a4456c49b1e5de8f659682a814bb4b5854d2.tar.gz yuzu-0bd9a4456c49b1e5de8f659682a814bb4b5854d2.tar.bz2 yuzu-0bd9a4456c49b1e5de8f659682a814bb4b5854d2.tar.lz yuzu-0bd9a4456c49b1e5de8f659682a814bb4b5854d2.tar.xz yuzu-0bd9a4456c49b1e5de8f659682a814bb4b5854d2.tar.zst yuzu-0bd9a4456c49b1e5de8f659682a814bb4b5854d2.zip |
Diffstat (limited to 'src/core/hle/kernel/svc/svc_condition_variable.cpp')
-rw-r--r-- | src/core/hle/kernel/svc/svc_condition_variable.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/svc/svc_condition_variable.cpp b/src/core/hle/kernel/svc/svc_condition_variable.cpp index ca120d67e..bb678e6c5 100644 --- a/src/core/hle/kernel/svc/svc_condition_variable.cpp +++ b/src/core/hle/kernel/svc/svc_condition_variable.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" +#include "core/hle/kernel/k_hardware_timer.h" #include "core/hle/kernel/k_memory_layout.h" #include "core/hle/kernel/k_process.h" #include "core/hle/kernel/kernel.h" @@ -25,7 +26,7 @@ Result WaitProcessWideKeyAtomic(Core::System& system, u64 address, u64 cv_key, u if (timeout_ns > 0) { const s64 offset_tick(timeout_ns); if (offset_tick > 0) { - timeout = offset_tick + 2; + timeout = system.Kernel().HardwareTimer().GetTick() + offset_tick + 2; if (timeout <= 0) { timeout = std::numeric_limits<s64>::max(); } |