diff options
| author | bunnei <bunneidev@gmail.com> | 2018-03-18 22:25:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-18 22:25:09 -0400 |
| commit | 2dc3a56e9602e0bfba9bfc19f31f0433d1564ccc (patch) | |
| tree | 6e49476a6c0c1a333090a01afa7a4fbfd11b8888 /src/core/hle/kernel/wait_object.cpp | |
| parent | 2332a44b681473509ca67438b5b3a2bddc91a60b (diff) | |
| parent | c1c92c30f9951e41a2091770cc5bf1354fba7794 (diff) | |
Merge pull request #250 from bunnei/buffer-dequeue-wait
vi: TransactParcel DequeueBuffer should wait current thread
Diffstat (limited to 'src/core/hle/kernel/wait_object.cpp')
| -rw-r--r-- | src/core/hle/kernel/wait_object.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/wait_object.cpp b/src/core/hle/kernel/wait_object.cpp index ec147b84c..b08ac72c1 100644 --- a/src/core/hle/kernel/wait_object.cpp +++ b/src/core/hle/kernel/wait_object.cpp @@ -39,7 +39,8 @@ SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() { for (const auto& thread : waiting_threads) { // The list of waiting threads must not contain threads that are not waiting to be awakened. ASSERT_MSG(thread->status == THREADSTATUS_WAIT_SYNCH_ANY || - thread->status == THREADSTATUS_WAIT_SYNCH_ALL, + thread->status == THREADSTATUS_WAIT_SYNCH_ALL || + thread->status == THREADSTATUS_WAIT_HLE_EVENT, "Inconsistent thread statuses in waiting_threads"); if (thread->current_priority >= candidate_priority) |