diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-06-28 21:03:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 21:03:52 -0700 |
| commit | de79b6fc4857fde1df3c8a4a2b38d231f2cc961d (patch) | |
| tree | 9a1d10c098540793d97592c38352aa5d49214286 | |
| parent | 87c07643ff14f2a5ea61fc92c2a83529a166781a (diff) | |
| parent | 81d3462a199dbaa0c95faa203918cd21d1da1277 (diff) | |
Merge pull request #1869 from wwylele/dont-be-lazy
Switch context to the same thread if necessary
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 492c821e3..9dea995f4 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -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) { |