From 3b885691a1ec33b0105d8e863dc003a7e019649b Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Mon, 16 Jul 2018 20:55:53 -0600 Subject: Kernel/Arbiter: Fix bug in WaitIfLessThan --- src/core/hle/kernel/address_arbiter.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index e9c8369d7..d5df9590a 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -115,7 +115,7 @@ ResultCode ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr address, s32 valu s32 updated_value; if (waiting_threads.size() == 0) { updated_value = value - 1; - } else if (num_to_wake <= 0 || waiting_threads.size() <= num_to_wake) { + } else if (num_to_wake <= 0 || waiting_threads.size() <= static_cast(num_to_wake)) { updated_value = value + 1; } else { updated_value = value; @@ -140,7 +140,9 @@ ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool s32 cur_value = static_cast(Memory::Read32(address)); if (cur_value < value) { - Memory::Write32(address, static_cast(cur_value - 1)); + if (should_decrement) { + Memory::Write32(address, static_cast(cur_value - 1)); + } } else { return ERR_INVALID_STATE; } -- cgit v1.2.3