Merge branch 'master' into feature/savestates-2

2020-04-12 11:24:06 +01:00 · 2020-04-12 11:24:06 +01:00 · 828f88d20a
commit 828f88d20a
parent 77c4b26e6c a1be6a4ffe
76 changed files with 3507 additions and 1369 deletions
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@ -223,6 +223,7 @@ void Thread::ResumeFromWait() {
    case ThreadStatus::WaitArb:
    case ThreadStatus::WaitSleep:
    case ThreadStatus::WaitIPC:
+    case ThreadStatus::Dormant:
        break;

    case ThreadStatus::Ready: