ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dubious retain on OS X. 

Revert this if the claimed crash actually shows up - or better, figure
out the actual cause.
This commit is contained in:
comex 2013-09-04 01:11:04 -04:00
parent e0214b1a38
commit 0e949afa57
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
View File

@ -210,11 +210,6 @@ bool Wiimote::Connect()
return false; return false;
} }
// As of 10.8 these need explicit retaining or writing to the wiimote has a very high
// chance of crashing and burning.
[ichan retain];
[cchan retain];
NOTICE_LOG(WIIMOTE, "Connected to wiimote %i at %s", NOTICE_LOG(WIIMOTE, "Connected to wiimote %i at %s",
index + 1, [[btd addressString] UTF8String]); index + 1, [[btd addressString] UTF8String]);
@ -227,15 +222,15 @@ bool Wiimote::Connect()
// Disconnect a wiimote. // Disconnect a wiimote.
void Wiimote::Disconnect() void Wiimote::Disconnect()
{ {
if (btd != NULL)
[btd closeConnection];
if (ichan != NULL) if (ichan != NULL)
[ichan release]; [ichan release];
if (cchan != NULL) if (cchan != NULL)
[cchan release]; [cchan release];
if (btd != NULL)
[btd closeConnection];
btd = NULL; btd = NULL;
cchan = NULL; cchan = NULL;
ichan = NULL; ichan = NULL;