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

GB, GBA Serialize: Fix loading two states in a row

This commit is contained in:
Vicki Pfau 2019-02-22 22:22:06 -08:00
parent 56d263ef24
commit 5effd9c113
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -22,6 +22,7 @@ Bugfixes:
- GBA DMA: Fix Display Start DMAs - GBA DMA: Fix Display Start DMAs
- GBA DMA: Fix DMA start/end timing - GBA DMA: Fix DMA start/end timing
- Qt: Fix window icon on X11 - Qt: Fix window icon on X11
- GB, GBA Serialize: Fix loading two states in a row
Misc: Misc:
- GBA Savedata: EEPROM performance fixes - GBA Savedata: EEPROM performance fixes
- GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash - GBA Savedata: Automatically map 1Mbit Flash files as 1Mbit Flash

2
src/gb/serialize.c
View File

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

2
src/gba/serialize.c
View File

@ -132,7 +132,7 @@ bool GBADeserialize(struct GBA* gba, const struct GBASerializedState* state) {
if (error) { if (error) {
return false; return false;
} }
gba->timing.root = NULL; mTimingClear(&gba->timing);
LOAD_32(gba->timing.masterCycles, 0, &state->masterCycles); LOAD_32(gba->timing.masterCycles, 0, &state->masterCycles);
size_t i; size_t i;