Parcourir la source

Thread: Check that thread is actually in "wait state" when verifying wait.

bunnei il y a 11 ans
Parent
commit
de851ba1a1
1 fichiers modifiés avec 1 ajouts et 1 suppressions
  1. 1 1
      src/core/hle/kernel/thread.cpp

+ 1 - 1
src/core/hle/kernel/thread.cpp

@@ -143,7 +143,7 @@ void ChangeReadyState(Thread* t, bool ready) {
 /// Verify that a thread has not been released from waiting
 /// Verify that a thread has not been released from waiting
 inline bool VerifyWait(const Thread* thread, WaitType type, Handle wait_handle) {
 inline bool VerifyWait(const Thread* thread, WaitType type, Handle wait_handle) {
     _dbg_assert_(KERNEL, thread != nullptr);
     _dbg_assert_(KERNEL, thread != nullptr);
-    return type == thread->wait_type && wait_handle == thread->wait_handle;
+    return (type == thread->wait_type) && (wait_handle == thread->wait_handle) && (thread->IsWaiting());
 }
 }
 
 
 /// Stops the current thread
 /// Stops the current thread