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

fix bug which made it impossible to loadstate while in moviemode

This commit is contained in:
zeromus 2009-05-04 06:28:24 +00:00
parent 7d493c16c4
commit 9e8e46f1c0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NDSSystem.cpp
View File

@ -874,6 +874,7 @@ void NDS_FreeROM(void)
MMU.bupmem.fp = NULL;
}
bool _HACK_DONT_STOPMOVIE = false;
void NDS_Reset( void)
{
unsigned int i;
@ -882,7 +883,8 @@ void NDS_Reset( void)
FILE* inf = 0;
NDS_header * header = NDS_getROMHeader();
FCEUI_StopMovie();
if(!_HACK_DONT_STOPMOVIE)
FCEUI_StopMovie();
if (!header) return ;

3
src/saves.cpp
View File

@ -862,7 +862,10 @@ static bool savestate_load(std::istream* is)
//while the series of resets below should work,
//we are testing the robustness of the savestate system with this full reset.
//the full reset wipes more things, so we can make sure that they are being restored correctly
extern bool _HACK_DONT_STOPMOVIE;
_HACK_DONT_STOPMOVIE = true;
NDS_Reset();
_HACK_DONT_STOPMOVIE = false;
//reset some options to their old defaults which werent saved
nds.debugConsole = FALSE;