diff options
| author |  bunnei | 2014-11-30 08:41:49 -0500 |
|---|---|---|
| committer | bunnei | 2014-11-30 08:41:49 -0500 |
| commit | a5afad09378dab8978e8e4149337aebf70891668 (patch) | |
| tree | 8affb19959e7b78fdb0b1aea80569b2ba30b1863 /src/core/hle/kernel/thread.cpp | |
| parent | Merge pull request #228 from linkmauve/glfw-error (diff) | |
| parent | Thread: Check that thread is actually in "wait state" when verifying wait. (diff) | |
| download | yuzu-a5afad09378dab8978e8e4149337aebf70891668.tar.gz yuzu-a5afad09378dab8978e8e4149337aebf70891668.tar.xz yuzu-a5afad09378dab8978e8e4149337aebf70891668.zip | |
Merge pull request #226 from bunnei/svc-and-thread-fixes
Svc and thread fixes
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -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 |