diff options
author | bunnei <bunneidev@gmail.com> | 2015-01-04 22:55:53 -0500 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-01-04 22:55:53 -0500 |
commit | 96e6b2aa50a59889c828e2464e8e2ccfbc5fd35b (patch) | |
tree | 76ec3ff4f0f07f6bd76ba5ebed8703260868ac9e /src | |
parent | 26f31a2dfb9406927e69a7a4befc78c21844a69a (diff) | |
parent | ea80363cc28e169ef3fe65918435b95ba945cc36 (diff) |
Merge pull request #408 from Subv/mutex
Mutex: Add the calling thread to the waiting list when needed
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/kernel/mutex.cpp | 4 |
1 files 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<bool> 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); |