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

- fixed movie not closing when loading a new rom or closing the rom 

- fixed tab+alt key combination getting the emulator stuck in fast-forward mode
This commit is contained in:
nitsuja 2009-11-01 09:07:21 +00:00
parent 9c84eb674c
commit 95e463ce27
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
desmume/src/NDSSystem.cpp
View File

@ -804,6 +804,8 @@ int NDS_LoadROM(const char *filename, const char *logicalFilename)
#endif #endif
cheatsSearchClose(); cheatsSearchClose();
FCEUI_StopMovie();
MMU_unsetRom(); MMU_unsetRom();
NDS_SetROM((u8*)gameInfo.romdata, mask); NDS_SetROM((u8*)gameInfo.romdata, mask);
NDS_Reset(); NDS_Reset();
@ -952,6 +954,7 @@ int NDS_LoadROM(const char *filename, const char *logicalFilename)
#endif #endif
void NDS_FreeROM(void) void NDS_FreeROM(void)
{ {
FCEUI_StopMovie();
if ((u8*)MMU.CART_ROM == (u8*)gameInfo.romdata) if ((u8*)MMU.CART_ROM == (u8*)gameInfo.romdata)
gameInfo.romdata = NULL; gameInfo.romdata = NULL;
if (MMU.CART_ROM != MMU.UNUSED_RAM) if (MMU.CART_ROM != MMU.UNUSED_RAM)

4
desmume/src/windows/main.cpp
View File

@ -2824,7 +2824,9 @@ int HandleKeyUp(WPARAM wParam, LPARAM lParam, int modifiers)
SCustomKey *key = &CustomKeys.key(0); SCustomKey *key = &CustomKeys.key(0);
while (!IsLastCustomKey(key)) { while (!IsLastCustomKey(key)) {
if (wParam == key->key && modifiers == key->modifiers && key->handleKeyUp) { // the modifiers check here was disabled to fix the following problem:
// hold tab, hold alt, release tab, release alt -> fast forward gets stuck on
if (key->handleKeyUp && wParam == key->key /*&& modifiers == key->modifiers*/) {
key->handleKeyUp(key->param); key->handleKeyUp(key->param);
} }
key++; key++;