aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2014-11-26 00:38:50 -0500
committerGravatar bunnei <bunneidev@gmail.com>2014-11-26 15:04:08 -0500
commitde851ba1a18ce2439a0b8ad46081990df377347c (patch)
tree035bd6d340ec4b31077eb24144f990f50cdb6c1c /src
parentf985469901f4056a8bb597d1a0bdecb40d7139eb (diff)
Thread: Check that thread is actually in "wait state" when verifying wait.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/thread.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index f3f54a4e..f5979590 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/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
inline bool VerifyWait(const Thread* thread, WaitType type, Handle wait_handle) {
_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