purgatory/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hle: kernel: KThread: DummyThread can be waited, ensure wait_queue is not nullptr.

Browse Source
This commit is contained in:
bunnei 2022-01-18 17:56:08 -08:00
parent 46a620f9d7
commit 91ff6d4cb3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/hle/kernel/k_thread.cpp
View File

@ -1097,14 +1097,14 @@ void KThread::EndWait(ResultCode wait_result_) {
// Lock the scheduler. // Lock the scheduler.
KScopedSchedulerLock sl(kernel); KScopedSchedulerLock sl(kernel);
// Dummy threads are just used by host threads for locking, and will never have a wait_queue. // If we're waiting, notify our queue that we're available.
if (thread_type == ThreadType::Dummy) { if (GetState() == ThreadState::Waiting) {
ASSERT_MSG(false, "Dummy threads should never call EndWait!"); if (wait_queue == nullptr) {
// This should never happen, but avoid a hard crash below to get this logged.
ASSERT_MSG(false, "wait_queue is nullptr!");
return; return;
} }
// If we're waiting, notify our queue that we're available.
if (GetState() == ThreadState::Waiting) {
wait_queue->EndWait(this, wait_result_); wait_queue->EndWait(this, wait_result_);
} }
} }