octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1869 from wwylele/dont-be-lazy 

Switch context to the same thread if necessary
This commit is contained in:
Yuri Kunde Schlesner 2016-06-28 21:03:52 -07:00 committed by GitHub
parent 87c07643ff 81d3462a19
commit de79b6fc48
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/kernel/thread.cpp
View File

@ -591,8 +591,12 @@ void Reschedule() {
HLE::DoneRescheduling();
// Don't bother switching to the same thread
if (next == cur)
// Don't bother switching to the same thread.
// But if the thread was waiting on objects, we still need to switch it
// to perform PC modification, change state to RUNNING, etc.
// This occurs in the case when an object the thread is waiting on immediately wakes up
// the current thread before Reschedule() is called.
if (next == cur && (next == nullptr || next->waitsynch_waited == false))
return;
if (cur && next) {