aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei <ericbunnie@gmail.com>2014-06-06 17:57:52 -0400
committerGravatar bunnei <ericbunnie@gmail.com>2014-06-13 09:51:14 -0400
commit12e2a59565520382e76c641896b594fdafebd244 (patch)
tree8e10228fa547486573b717bc25e77d47762dd766 /src
parent4d6c96b7d8d77b87fcc137aa03cd6a4e4313bdc7 (diff)
Thread: Updated VerifyWait to be more readable (but functionally the same).
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/thread.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 700f4ea7..0385a64f 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -146,12 +146,11 @@ void ChangeReadyState(Thread* t, bool ready) {
inline bool VerifyWait(const Handle& thread, WaitType type, Handle handle) {
Handle wait_id = 0;
Thread *t = g_object_pool.GetFast<Thread>(thread);
- if (t) {
- if (type == t->wait_type && handle == t->wait_handle) {
- return true;
- }
+ if (t != nullptr && type == t->wait_type && handle == t->wait_handle) {
+ return true;
} else {
ERROR_LOG(KERNEL, "thread 0x%08X does not exist", thread);
+ return false;
}
return false;
}