emu-mirror/citra-canary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #408 from Subv/mutex

Browse Source 
Mutex: Add the calling thread to the waiting list when needed
This commit is contained in:
bunnei 2015-01-04 22:55:53 -05:00
commit 96e6b2aa50
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/kernel/mutex.cpp
View File

@ -168,9 +168,9 @@ Handle CreateMutex(bool initial_locked, const std::string& name) {
ResultVal<bool> Mutex::WaitSynchronization() { ResultVal<bool> Mutex::WaitSynchronization() {
bool wait = locked; bool wait = locked;
if (locked) { if (locked) {
waiting_threads.push_back(GetCurrentThreadHandle());
Kernel::WaitCurrentThread(WAITTYPE_MUTEX, GetHandle()); Kernel::WaitCurrentThread(WAITTYPE_MUTEX, GetHandle());
} } else {
else {
// Lock the mutex when the first thread accesses it // Lock the mutex when the first thread accesses it
locked = true; locked = true;
MutexAcquireLock(this); MutexAcquireLock(this);