diff options
| author | bunnei <bunneidev@gmail.com> | 2015-01-09 12:59:35 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-09 12:59:35 -0500 |
| commit | 6ae12424df58f0ea171fc75ca4b700ab1fffc192 (patch) | |
| tree | 93d87f3cb19d08541c6b8f8a9e0ceb730a2b13d9 /src/core/hle/kernel/timer.cpp | |
| parent | 86e07124adcbe0ec8f35740d3ac2d516dc07f771 (diff) | |
| parent | 78ea76e12f22495b3b726a19147b60b2eaf50a9d (diff) | |
Merge pull request #444 from yuriks/handle-reform2
Kernel Lifetime Reform Pt. 2
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 7ac669e31a..685a202c06 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(); |