diff options
| author |  bunnei | 2018-05-20 23:44:44 -0400 |
|---|---|---|
| committer |  GitHub | 2018-05-20 23:44:44 -0400 |
| commit | 693f78e6c2cc8c19aa9d03d81dd9ee052b08c4ba (patch) | |
| tree | 4dfd15315d31971bedd82eb243ddf2bfd319620b /src/core/hle/kernel/mutex.cpp | |
| parent | Merge pull request #458 from Subv/fmnmx (diff) | |
| parent | Mutex: Do not assert when the mutex waiting threads list isn't empty on mutex... (diff) | |
| download | yuzu-693f78e6c2cc8c19aa9d03d81dd9ee052b08c4ba.tar.gz yuzu-693f78e6c2cc8c19aa9d03d81dd9ee052b08c4ba.tar.xz yuzu-693f78e6c2cc8c19aa9d03d81dd9ee052b08c4ba.zip | |
Merge pull request #457 from Subv/mutex_waiters
Mutex: Do not assert when the mutex waiting threads list isn't empty on mutex release.
Diffstat (limited to 'src/core/hle/kernel/mutex.cpp')
| -rw-r--r-- | src/core/hle/kernel/mutex.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index 63733ad79..bc144f3de 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp | |||
| @@ -104,7 +104,6 @@ ResultCode Mutex::Release(VAddr address) { | |||
| 104 | 104 | ||
| 105 | // There are no more threads waiting for the mutex, release it completely. | 105 | // There are no more threads waiting for the mutex, release it completely. |
| 106 | if (thread == nullptr) { | 106 | if (thread == nullptr) { |
| 107 | ASSERT(GetCurrentThread()->wait_mutex_threads.empty()); | ||
| 108 | Memory::Write32(address, 0); | 107 | Memory::Write32(address, 0); |
| 109 | return RESULT_SUCCESS; | 108 | return RESULT_SUCCESS; |
| 110 | } | 109 | } |