Просмотр исходного кода

Switch context on the same thread if necessary

wwylele 10 лет назад
Родитель
Сommit
81d3462a19
1 измененных файлов с 6 добавлено и 2 удалено
  1. 6 2
      src/core/hle/kernel/thread.cpp

+ 6 - 2
src/core/hle/kernel/thread.cpp

@@ -542,8 +542,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) {