OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 13:10:05 +00:00
Code Issues Projects Releases Wiki Activity

Thread: Cleaned up VerifyWait, fixed issue where nullptr msg could unnecessarily be logged.

Browse Source
This commit is contained in:
bunnei 2014-06-09 22:08:49 -04:00
parent 4620e2a741
commit 5b7cf50a77
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/hle/kernel/thread.cpp
View File

@ -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