Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly remove a thread from its wait_objects' waitlist when it is awoken by a timeout.

Browse source
This commit is contained in:
Subv 2016-12-10 13:29:31 -05:00
parent 17b29d8865
commit 406907d570
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/hle/kernel/thread.cpp
View file

@ -277,6 +277,10 @@ static void ThreadWakeupCallback(u64 thread_handle, int cycles_late) {
if (thread->status == THREADSTATUS_WAIT_SYNCH || thread->status == THREADSTATUS_WAIT_ARB) {
thread->wait_set_output = false;
// Remove the thread from each of its waiting objects' waitlists
for (auto& object : thread->wait_objects)
object->RemoveWaitingThread(thread.get());
thread->wait_objects.clear();
thread->SetWaitSynchronizationResult(ResultCode(ErrorDescription::Timeout, ErrorModule::OS,
ErrorSummary::StatusChanged,
ErrorLevel::Info));