kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shuffled around init/deinit of vio2sf state a bit

CQTexperiment
Chris Moeller 2013-10-13 13:21:56 -07:00
parent 11fb240606
commit 7e34ccd15a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/vio2sf/vio2sf/src/vio2sf/desmume/state.c
View File

@ -259,8 +259,10 @@ int state_init(struct NDS_state *state)
void state_deinit(struct NDS_state *state) void state_deinit(struct NDS_state *state)
{ {
MMU_unsetRom(state); if (state->MMU)
NDS_DeInit(state); MMU_unsetRom(state);
if (state->nds && state->MMU && state->NDS_ARM7 && state->NDS_ARM9 && state->MainScreen && state->SubScreen)
NDS_DeInit(state);
if (state->nds) free(state->nds); if (state->nds) free(state->nds);
state->nds = NULL; state->nds = NULL;
if (state->NDS_ARM7) free(state->NDS_ARM7); if (state->NDS_ARM7) free(state->NDS_ARM7);

11
Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm
View File

@ -1003,12 +1003,17 @@ static int twosf_info(void * context, const char * name, const char * value)
return NO; return NO;
} }
if ( state_init(core) )
{
state_deinit(core);
if (state.rom) free(state.rom);
if (state.state) free(state.state);
return NO;
}
emulatorCore = ( uint8_t * ) core; emulatorCore = ( uint8_t * ) core;
emulatorExtra = state.rom; emulatorExtra = state.rom;
if ( state_init(core) )
return NO;
if ( state.rom ) if ( state.rom )
state_setrom(core, state.rom, (u32) state.rom_size ); state_setrom(core, state.rom, (u32) state.rom_size );