Merge pull request #2396 from Subv/sema_acquire

Kernel/Semaphore: Fixed a regression in semaphore waits.
2017-01-06 22:00:12 -05:00 · 2017-01-06 22:00:12 -05:00 · 59f4f1d7ff
parent f0199a17f6 4251eb26ec
commit 59f4f1d7ff
1 changed files with 2 additions and 1 deletions
--- a/src/core/hle/kernel/semaphore.cpp
+++ b/src/core/hle/kernel/semaphore.cpp
@ -35,7 +35,8 @@ bool Semaphore::ShouldWait(Thread* thread) const {
 }

 void Semaphore::Acquire(Thread* thread) {
-    ASSERT_MSG(!ShouldWait(thread), "object unavailable!");
+    if (available_count <= 0)
+        return;
    --available_count;
 }