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

properly report savestate-load failure

This commit is contained in:
Arisotura 2022-01-06 22:43:00 +01:00
parent 211a1ed5f2
commit 1e2982481c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/NDS.cpp
View File

@ -807,10 +807,7 @@ bool DoSavestate(Savestate* file)
u32 console; u32 console;
file->Var32(&console); file->Var32(&console);
if (console != ConsoleType) if (console != ConsoleType)
{
file->Error = true;
return false; return false;
}
} }
file->VarArray(MainRAM, MainRAMMaxSize); file->VarArray(MainRAM, MainRAMMaxSize);

10
src/frontend/qt_sdl/ROMManager.cpp
View File

@ -304,9 +304,17 @@ bool LoadState(std::string filename)
failed = true; failed = true;
} }
NDS::DoSavestate(state); bool res = NDS::DoSavestate(state);
delete state; delete state;
if (!res)
{
failed = true;
state = new Savestate("timewarp.mln", false);
NDS::DoSavestate(state);
delete state;
}
if (failed) return false; if (failed) return false;
if (Config::SavestateRelocSRAM && NDSSave) if (Config::SavestateRelocSRAM && NDSSave)