M CHANGES → CHANGES

@@ -15,6 +15,7 @@ - Python: Make sure GB link object isn't GC'd before GB object
  - GBA DMA: Fix Display Start DMAs
  - GBA DMA: Fix DMA start/end timing
  - Qt: Fix window icon on X11
+ - GB, GBA Serialize: Fix loading two states in a row
 Misc:
  - GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1274)
 

M src/gb/serialize.c → src/gb/serialize.c

@@ -138,7 +138,7 @@ }
 	if (error) {
 		return false;
 	}
-	gb->timing.root = NULL;
+	mTimingClear(&gb->timing);
 	LOAD_32LE(gb->timing.masterCycles, 0, &state->masterCycles);
 
 	gb->cpu->a = state->cpu.a;

M src/gba/serialize.c → src/gba/serialize.c

@@ -128,7 +128,7 @@ }
 	if (error) {
 		return false;
 	}
-	gba->timing.root = NULL;
+	mTimingClear(&gba->timing);
 	LOAD_32(gba->timing.masterCycles, 0, &state->masterCycles);
 
 	size_t i;