From ea80363cc28e169ef3fe65918435b95ba945cc36 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 4 Jan 2015 12:52:34 -0500 Subject: [PATCH] Mutex: Add the calling thread to the waiting list when needed This will happen when the mutex is already owned by another thread. Should fix some issues with games being stuck due to waiting threads not being awoken. --- src/core/hle/kernel/mutex.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index 558068c79..3dfeffc9b 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp @@ -168,9 +168,9 @@ Handle CreateMutex(bool initial_locked, const std::string& name) { ResultVal Mutex::WaitSynchronization() { bool wait = locked; if (locked) { + waiting_threads.push_back(GetCurrentThreadHandle()); Kernel::WaitCurrentThread(WAITTYPE_MUTEX, GetHandle()); - } - else { + } else { // Lock the mutex when the first thread accesses it locked = true; MutexAcquireLock(this);