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

GB Serialize: Fix crash when loading pre-0.7 SGB savestates

This commit is contained in:
Vicki Pfau 2021-03-23 00:07:11 -07:00
parent c2de079a9d
commit 9eee7a7c7a
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -83,6 +83,7 @@ Other fixes:
- FFmpeg: Fix encoding of time base - FFmpeg: Fix encoding of time base
- GB: Fix crash when changing ROM while in banked address space - GB: Fix crash when changing ROM while in banked address space
- GB: Fix loading model overrides - GB: Fix loading model overrides
- GB Serialize: Fix crash when loading pre-0.7 SGB savestates
- GB Video: Fix SGB video logs - GB Video: Fix SGB video logs
- GBA: Fix loading multiboot ELF files (fixes mgba.io/i/1949) - GBA: Fix loading multiboot ELF files (fixes mgba.io/i/1949)
- GBA: Fix loading subsequent save files (fixes mgba.io/i/2067) - GBA: Fix loading subsequent save files (fixes mgba.io/i/2067)

4
src/gb/serialize.c
View File

@ -195,6 +195,10 @@ bool GBDeserialize(struct GB* gb, const struct GBSerializedState* state) {
gb->audio.style = GB_AUDIO_CGB; gb->audio.style = GB_AUDIO_CGB;
} }
if (!canSgb) {
gb->model &= ~GB_MODEL_SGB;
}
GBUnmapBIOS(gb); GBUnmapBIOS(gb);
GBMemoryDeserialize(gb, state); GBMemoryDeserialize(gb, state);
GBVideoDeserialize(&gb->video, state); GBVideoDeserialize(&gb->video, state);