all repos — mgba @ f66c17533b92e748fc09815741b458d26e4745a4

mGBA Game Boy Advance Emulator

GBA Serialize: Fix using the wrong storage for biosStall
Vicki Pfau vi@endrift.com
Mon, 10 Aug 2020 19:21:46 -0700
commit

f66c17533b92e748fc09815741b458d26e4745a4

parent

66cc5b145145a3f381340d1f0fe51398fe1327e3

1 files changed, 2 insertions(+), 2 deletions(-)

jump to
M src/gba/serialize.c → src/gba/serialize.c 
@@ -69,7 +69,7 @@ STORE_32(gba->irqEvent.when - mTimingCurrentTime(&gba->timing), 0, &state->nextIrq);
 	}
 	miscFlags = GBASerializedMiscFlagsSetBlocked(miscFlags, gba->cpuBlocked);
 	STORE_32(miscFlags, 0, &state->miscFlags);
-	STORE_32(gba->biosStall, 0, &state->nextIrq);
+	STORE_32(gba->biosStall, 0, &state->biosStall);
 
 	GBAMemorySerialize(&gba->memory, state);
 	GBAIOSerialize(gba, state);

@@ -188,7 +188,7 @@ LOAD_32(when, 0, &state->nextIrq);
 		mTimingSchedule(&gba->timing, &gba->irqEvent, when);		
 	}
 	gba->cpuBlocked = GBASerializedMiscFlagsGetBlocked(miscFlags);
-	LOAD_32(gba->biosStall, 0, &state->nextIrq);
+	LOAD_32(gba->biosStall, 0, &state->biosStall);
 
 	GBAVideoDeserialize(&gba->video, state);
 	GBAMemoryDeserialize(&gba->memory, state);