diff --git a/CHANGES b/CHANGES index 961ac19d9..20c0cbeef 100644 --- a/CHANGES +++ b/CHANGES @@ -83,6 +83,7 @@ Other fixes: - FFmpeg: Fix encoding of time base - GB: Fix crash when changing ROM while in banked address space - GB: Fix loading model overrides + - GB Serialize: Fix crash when loading pre-0.7 SGB savestates - GB Video: Fix SGB video logs - GBA: Fix loading multiboot ELF files (fixes mgba.io/i/1949) - GBA: Fix loading subsequent save files (fixes mgba.io/i/2067) diff --git a/src/gb/serialize.c b/src/gb/serialize.c index 5c0c2985a..ac7352a91 100644 --- a/src/gb/serialize.c +++ b/src/gb/serialize.c @@ -195,6 +195,10 @@ bool GBDeserialize(struct GB* gb, const struct GBSerializedState* state) { gb->audio.style = GB_AUDIO_CGB; } + if (!canSgb) { + gb->model &= ~GB_MODEL_SGB; + } + GBUnmapBIOS(gb); GBMemoryDeserialize(gb, state); GBVideoDeserialize(&gb->video, state);