diff options
| author |  bunnei | 2014-11-26 00:38:50 -0500 |
|---|---|---|
| committer | bunnei | 2014-11-26 15:04:08 -0500 |
| commit | de851ba1a18ce2439a0b8ad46081990df377347c (patch) | |
| tree | 035bd6d340ec4b31077eb24144f990f50cdb6c1c /src | |
| parent | SVC: Add debug log to ArbitrateAddress. (diff) | |
| download | yuzu-de851ba1a18ce2439a0b8ad46081990df377347c.tar.gz yuzu-de851ba1a18ce2439a0b8ad46081990df377347c.tar.xz yuzu-de851ba1a18ce2439a0b8ad46081990df377347c.zip | |
Thread: Check that thread is actually in "wait state" when verifying wait.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index f3f54a4e9..f59795901 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) { | |||
| 143 | /// Verify that a thread has not been released from waiting | 143 | /// Verify that a thread has not been released from waiting |
| 144 | inline bool VerifyWait(const Thread* thread, WaitType type, Handle wait_handle) { | 144 | inline bool VerifyWait(const Thread* thread, WaitType type, Handle wait_handle) { |
| 145 | _dbg_assert_(KERNEL, thread != nullptr); | 145 | _dbg_assert_(KERNEL, thread != nullptr); |
| 146 | return type == thread->wait_type && wait_handle == thread->wait_handle; | 146 | return (type == thread->wait_type) && (wait_handle == thread->wait_handle) && (thread->IsWaiting()); |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | /// Stops the current thread | 149 | /// Stops the current thread |