Parcourir la source

wait_object: Make wait behavior only require one object to signal.
- This was holdover from citra.

Zach Hilman il y a 7 ans
Parent
commit
7a547b9342
1 fichiers modifiés avec 2 ajouts et 11 suppressions
  1. 2 11
      src/core/hle/kernel/wait_object.cpp

+ 2 - 11
src/core/hle/kernel/wait_object.cpp

@@ -50,17 +50,8 @@ std::shared_ptr<Thread> WaitObject::GetHighestPriorityReadyThread() const {
         if (ShouldWait(thread.get()))
         if (ShouldWait(thread.get()))
             continue;
             continue;
 
 
-        // A thread is ready to run if it's either in ThreadStatus::WaitSynch
-        // and the rest of the objects it is waiting on are ready.
-        bool ready_to_run = true;
-        if (thread_status == ThreadStatus::WaitSynch) {
-            ready_to_run = thread->AllWaitObjectsReady();
-        }
-
-        if (ready_to_run) {
-            candidate = thread.get();
-            candidate_priority = thread->GetPriority();
-        }
+        candidate = thread.get();
+        candidate_priority = thread->GetPriority();
     }
     }
 
 
     return SharedFrom(candidate);
     return SharedFrom(candidate);