From 872e9ce3da35d3dc56b28a578a41edc6008d49cf Mon Sep 17 00:00:00 2001
From: comex <comexk@gmail.com>
Date: Wed, 4 Sep 2013 04:39:18 -0400
Subject: [PATCH] Add accidentally omitted code in last commit.
(m_wiimote_thread_run_loop was being used but not set, causing
Wiimote::IOWakeup to crash on OS X; todo rebase this)
---
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index ddf54dfc5a..6cb9521981 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -510,6 +510,10 @@ void Wiimote::StopThread()
{
if (m_wiimote_thread.joinable())
m_wiimote_thread.join();
+#if defined(__APPLE__)
+ CFRelease(m_wiimote_thread_run_loop);
+ m_wiimote_thread_run_loop = NULL;
+#endif
}
void Wiimote::SetReady()
@@ -536,6 +540,10 @@ void Wiimote::WaitReady()
void Wiimote::ThreadFunc()
{
Common::SetCurrentThreadName("Wiimote Device Thread");
+#if defined(__APPLE__)
+ m_wiimote_thread_run_loop = (CFRunLoopRef) CFRetain(CFRunLoopGetCurrent());
+#endif
+
bool ok = ConnectInternal();
SetReady();