piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-24 06:39:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Split GBA Reset and Eject logic into two sets

Browse Source 
This allows solving some crashes and provides more
flexibility in how GBA cartridges change state between
soft and hard resets. Since save states including GBA
data do not carry over the original save file path,
and the GBA cartridge is being reset along with the other
parts of the system, this is needed to avoid losing
the GBA state on reset following a state load, while
preserving the behavior where cartridges are ejected
when calling Stop().
This commit is contained in:
Raphaël Zumer
2019-12-22 15:49:23 -05:00
parent f380767fab
commit 22d11209b0
3 changed files with 55 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libui_sdl/main.cpp
View File

@ -1694,6 +1694,7 @@ void Stop(bool internal)
RunningSomething = false;
// eject any inserted GBA cartridge
GBACart::Eject();
ROMPath[1][0] = '\0';
uiWindowSetTitle(MainWindow, "melonDS " MELONDS_VERSION);
@ -1834,6 +1835,8 @@ void LoadState(int slot)
return;
}
u32 oldGBACartCRC = GBACart::CartCRC;
// backup
Savestate* backup = new Savestate("timewarp.mln", true);
NDS::DoSavestate(backup);
@ -1870,9 +1873,24 @@ void LoadState(int slot)
NDS::RelocateSave(SRAMPath[0], false);
}
bool loadedPartialGBAROM = false;
// in case we have a GBA cart inserted, and the GBA ROM changes
// due to having loaded a save state, we do not want to reload
// the previous cartridge on reset, or commit writes to any
// loaded save file. therefore, their paths are "nulled".
if (GBACart::CartInserted && GBACart::CartCRC != oldGBACartCRC)
{
ROMPath[1][0] = '\0';
SRAMPath[1][0] = '\0';
loadedPartialGBAROM = true;
}
char msg[64];
if (slot > 0) sprintf(msg, "State loaded from slot %d", slot);
else sprintf(msg, "State loaded from file");
if (slot > 0) sprintf(msg, "State loaded from slot %d%s",
slot, loadedPartialGBAROM ? " (GBA ROM header only)" : "");
else sprintf(msg, "State loaded from file%s",
loadedPartialGBAROM ? " (GBA ROM header only)" : "");
OSD::AddMessage(0, msg);
SavestateLoaded = true;