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

Cocoa Port: 

- Fix bug where the frame wouldn’t update itself when starting/stopping GDB stub, frame advance, or frame jump under certain conditions.
This commit is contained in:
rogerman 2015-03-11 06:36:33 +00:00
parent af1c434727
commit 2cee9a1eb9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,6 +314,7 @@ volatile bool execute = true;
{ {
threadParam.isFrameSkipEnabled = false; threadParam.isFrameSkipEnabled = false;
threadParam.framesToSkip = 0; threadParam.framesToSkip = 0;
NDS_OmitFrameSkip(2);
} }
pthread_mutex_unlock(&threadParam.mutexThreadExecute); pthread_mutex_unlock(&threadParam.mutexThreadExecute);
@ -460,6 +461,7 @@ volatile bool execute = true;
if (isInDebugTrap && !theState) if (isInDebugTrap && !theState)
{ {
threadParam.framesToSkip = 0; threadParam.framesToSkip = 0;
NDS_OmitFrameSkip(2);
} }
isInDebugTrap = theState; isInDebugTrap = theState;
@ -636,6 +638,7 @@ volatile bool execute = true;
threadParam.state = coreState; threadParam.state = coreState;
threadParam.framesToSkip = 0; threadParam.framesToSkip = 0;
NDS_OmitFrameSkip(2);
switch (coreState) switch (coreState)
{ {
@ -1227,7 +1230,12 @@ static void* RunCoreThread(void *arg)
} }
else if (param->state == CORESTATE_FRAMEJUMP) else if (param->state == CORESTATE_FRAMEJUMP)
{ {
if (frameNum >= param->frameJumpTarget) if (frameNum == (param->frameJumpTarget - 1))
{
param->framesToSkip = 0;
NDS_OmitFrameSkip(2);
}
else if (frameNum >= param->frameJumpTarget)
{ {
[cdsCore restoreCoreState]; [cdsCore restoreCoreState];
} }