summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2013-02-24 22:29:33 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2013-02-24 22:29:33 -0600
commit6b2804e2960b4c8d9ba9ef95ad4c843eab9ae00b (patch)
treec81b8eed8ab0e197739d181f5e37de0317cf05e8 /Source/Core
parentef90b15f3ed032acd6b32b67b0a55e7a0df6a5b7 (diff)
Possible crashfix for OSX.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm3
-rw-r--r--Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
index fda1d99462..cec18ed63a 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
@@ -195,6 +195,8 @@ bool Wiimote::Connect()
ERROR_LOG(WIIMOTE, "Unable to open L2CAP channels "
"for wiimote %i", index + 1);
Disconnect();
+
+ [cbt release];
return false;
}
@@ -209,7 +211,6 @@ bool Wiimote::Connect()
m_connected = true;
[cbt release];
-
return true;
}
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index b5a1703527..3608c060fc 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -51,7 +51,7 @@ WiimoteScanner g_wiimote_scanner;
Wiimote::Wiimote()
: index()
#ifdef __APPLE__
- , inputlen(0)
+ , btd(), ichan(), cchan(), inputlen(), m_connected()
#elif defined(__linux__) && HAVE_BLUEZ
, cmd_sock(-1), int_sock(-1)
#elif defined(_WIN32)