mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 02:13:23 +02:00
Merge pull request #957 from Subv/hwtest_crash
Kernel/Scheduling: Clean up a thread's wait_objects when its scheduled.
This commit is contained in:
commit
dcc8f1bef2
@ -217,6 +217,14 @@ static void SwitchContext(Thread* new_thread) {
|
|||||||
new_thread->context.pc -= thumb_mode ? 2 : 4;
|
new_thread->context.pc -= thumb_mode ? 2 : 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clean up the thread's wait_objects, they'll be restored if needed during
|
||||||
|
// the svcWaitSynchronization call
|
||||||
|
for (int i = 0; i < new_thread->wait_objects.size(); ++i) {
|
||||||
|
SharedPtr<WaitObject> object = new_thread->wait_objects[i];
|
||||||
|
object->RemoveWaitingThread(new_thread);
|
||||||
|
}
|
||||||
|
new_thread->wait_objects.clear();
|
||||||
|
|
||||||
ready_queue.remove(new_thread->current_priority, new_thread);
|
ready_queue.remove(new_thread->current_priority, new_thread);
|
||||||
new_thread->status = THREADSTATUS_RUNNING;
|
new_thread->status = THREADSTATUS_RUNNING;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user