summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-07-03 23:21:48 -0400
committerbunnei <bunneidev@gmail.com>2020-02-05 23:06:53 -0500
commit7a547b934201863bc11246844ea24ab3b67be65e (patch)
tree7369f7d3f3f5eacefe8cacd802dbcc9864dd539f /src
parent3a0c1e79f8266a945df04394f478a3aa598702e5 (diff)
wait_object: Make wait behavior only require one object to signal.
- This was holdover from citra.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/wait_object.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/core/hle/kernel/wait_object.cpp b/src/core/hle/kernel/wait_object.cpp
index a0c806e8f..1838260fd 100644
--- a/src/core/hle/kernel/wait_object.cpp
+++ b/src/core/hle/kernel/wait_object.cpp
@@ -50,17 +50,8 @@ std::shared_ptr<Thread> WaitObject::GetHighestPriorityReadyThread() const {
if (ShouldWait(thread.get()))
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);