From 9bf8462b96d34b30f62b8aca745dd558e7f0a450 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Mon, 22 Dec 2014 11:07:22 -0200
Subject: Thread: Reduce use of Handles and move some funcs to inside the
 class.

---
 src/core/hle/kernel/semaphore.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/core/hle/kernel/semaphore.cpp')

diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp
index 6bc8066a..d7eeaa3d 100644
--- a/src/core/hle/kernel/semaphore.cpp
+++ b/src/core/hle/kernel/semaphore.cpp
@@ -37,8 +37,8 @@ public:
         bool wait = !IsAvailable();
 
         if (wait) {
-            Kernel::WaitCurrentThread(WAITTYPE_SEMA, GetHandle());
-            waiting_threads.push(GetCurrentThreadHandle());
+            Kernel::WaitCurrentThread(WAITTYPE_SEMA, this);
+            waiting_threads.push(GetCurrentThread()->GetHandle());
         } else {
             --available_count;
         }
@@ -84,7 +84,9 @@ ResultCode ReleaseSemaphore(s32* count, Handle handle, s32 release_count) {
     // Notify some of the threads that the semaphore has been released
     // stop once the semaphore is full again or there are no more waiting threads
     while (!semaphore->waiting_threads.empty() && semaphore->IsAvailable()) {
-        Kernel::ResumeThreadFromWait(semaphore->waiting_threads.front());
+        Thread* thread = Kernel::g_handle_table.Get<Thread>(semaphore->waiting_threads.front());
+        if (thread != nullptr)
+            thread->ResumeFromWait();
         semaphore->waiting_threads.pop();
         --semaphore->available_count;
     }
-- 
cgit v1.2.3