From 9eee7a7c7ac4ee3fa595ca2672e91ce916c92803 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 23 Mar 2021 00:07:11 -0700
Subject: [PATCH] GB Serialize: Fix crash when loading pre-0.7 SGB savestates

---
 CHANGES            | 1 +
 src/gb/serialize.c | 4 ++++
 2 files changed, 5 insertions(+)

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);