diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-06-09 22:08:49 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-06-13 09:51:16 -0400 |
| commit | 5b7cf50a7760ea1d4202ac3890cefc8934ac841f (patch) | |
| tree | f94a7a1dab9a9429ea73d16cf61102ccef2bc0e1 /src | |
| parent | 4620e2a741735a18f3a331037f86b3aae0f9fc6d (diff) | |
Thread: Cleaned up VerifyWait, fixed issue where nullptr msg could unnecessarily be logged.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index ebe308a936..baa9687cb9 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -143,16 +143,14 @@ void ChangeReadyState(Thread* t, bool ready) { } /// Verify that a thread has not been released from waiting -inline bool VerifyWait(const Handle& thread, WaitType type, Handle handle) { - Handle wait_id = 0; - Thread* t = g_object_pool.GetFast<Thread>(thread); - if (t != nullptr && type == t->wait_type && handle == t->wait_handle) { - return true; - } else { - ERROR_LOG(KERNEL, "thread 0x%08X does not exist", thread); +inline bool VerifyWait(const Handle& handle, WaitType type, Handle wait_handle) { + Thread* thread = g_object_pool.GetFast<Thread>(handle); + _assert_msg_(KERNEL, (thread != nullptr), "called, but thread is nullptr!"); + + if (type != thread->wait_type || wait_handle != thread->wait_handle) return false; - } - return false; + + return true; } /// Stops the current thread |