diff options
| author | bunnei <bunneidev@gmail.com> | 2014-11-30 08:41:49 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-11-30 08:41:49 -0500 |
| commit | a5afad09378dab8978e8e4149337aebf70891668 (patch) | |
| tree | 8affb19959e7b78fdb0b1aea80569b2ba30b1863 /src/core/hle/kernel | |
| parent | 2ad9ad9297d2f83b13667d885084c1a3e6daab3a (diff) | |
| parent | de851ba1a18ce2439a0b8ad46081990df377347c (diff) | |
Merge pull request #226 from bunnei/svc-and-thread-fixes
Svc and thread fixes
Diffstat (limited to 'src/core/hle/kernel')
| -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) { /// 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 |