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

Cocoa Port: 

- Fix potential deadlock on application exit.
- Misc. code cleanup.
This commit is contained in:
rogerman 2012-03-16 04:21:28 +00:00
parent f6f1678eca
commit 7f6e9074f4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desmume/src/cocoa/cocoa_core.mm
View File

@ -26,6 +26,7 @@
#include <mach/mach.h> #include <mach/mach.h>
#include <mach/mach_time.h> #include <mach/mach_time.h>
#include "../addons.h"
#include "../NDSSystem.h" #include "../NDSSystem.h"
#undef BOOL #undef BOOL
@ -165,6 +166,8 @@ static BOOL isCoreStarted = NO;
return isCoreStarted; return isCoreStarted;
} }
addonsChangePak(NDS_ADDON_NONE);
result = NDS_Init(); result = NDS_Init();
if (result == -1) if (result == -1)
{ {
@ -665,6 +668,7 @@ static void* RunCoreThread(void *arg)
if (param->exitThread) if (param->exitThread)
{ {
pthread_mutex_unlock(&param->mutexThreadExecute);
break; break;
} }
@ -716,10 +720,7 @@ static void* RunCoreThread(void *arg)
pthread_mutex_unlock(&param->mutexThreadExecute); pthread_mutex_unlock(&param->mutexThreadExecute);
// If there is any time left in the loop, go ahead and pad it. // If there is any time left in the loop, go ahead and pad it.
if(timeBudget > (mach_absolute_time() - startTime)) mach_wait_until(startTime + timeBudget);
{
mach_wait_until(startTime + timeBudget);
}
} while (!param->exitThread); } while (!param->exitThread);