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/timer.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 7ac669e31..685a202c0 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -33,8 +33,8 @@ public:
     ResultVal<bool> WaitSynchronization() override {
         bool wait = !signaled;
         if (wait) {
-            waiting_threads.insert(GetCurrentThreadHandle());
-            Kernel::WaitCurrentThread(WAITTYPE_TIMER, GetHandle());
+            waiting_threads.insert(GetCurrentThread()->GetHandle());
+            Kernel::WaitCurrentThread(WAITTYPE_TIMER, this);
         }
         return MakeResult<bool>(wait);
     }
@@ -92,8 +92,10 @@ static void TimerCallback(u64 timer_handle, int cycles_late) {
     timer->signaled = true;
 
     // Resume all waiting threads
-    for (Handle thread : timer->waiting_threads)
-        ResumeThreadFromWait(thread);
+    for (Handle thread_handle : timer->waiting_threads) {
+        if (Thread* thread = Kernel::g_handle_table.Get<Thread>(thread_handle))
+            thread->ResumeFromWait();
+    }
 
     timer->waiting_threads.clear();
 
-- 
cgit v1.2.3