M CHANGES → CHANGES

@@ -14,6 +14,7 @@ - GB, GBA: Fix crashes when attempting to identify null VFiles
  - GB MBC: Fix RTC initialization (fixes mgba.io/i/825)
  - GB MBC: Fix RTC loading when file size is off
  - GB Serialize: Fix deserializing video STAT
+ - GB, GBA Savedata: Fix savestate-related save overwriting (fixes mgba.io/i/834)
 Misc:
  - Qt: Don't rebuild library view if style hasn't changed
  - SDL: Fix 2.0.5 build on macOS under some circumstances

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

@@ -219,7 +219,7 @@ }
 
 void GBSramClean(struct GB* gb, uint32_t frameCount) {
 	// TODO: Share with GBASavedataClean
-	if (!gb->sramVf || gb->sramVf != gb->sramRealVf) {
+	if (!gb->sramVf) {
 		return;
 	}
 	if (gb->sramDirty & GB_SRAM_DIRT_NEW) {
@@ -229,6 +229,9 @@ if (!(gb->sramDirty & GB_SRAM_DIRT_SEEN)) {
 			gb->sramDirty |= GB_SRAM_DIRT_SEEN;
 		}
 	} else if ((gb->sramDirty & GB_SRAM_DIRT_SEEN) && frameCount - gb->sramDirtAge > CLEANUP_THRESHOLD) {
+		if (gb->sramMaskWriteback) {
+			GBSavedataUnmask(gb);
+		}
 		if (gb->memory.mbcType == GB_MBC3_RTC) {
 			GBMBCRTCWrite(gb);
 		}
@@ -258,7 +261,9 @@ GBSramDeinit(gb);
 	gb->sramVf = gb->sramRealVf;
 	gb->memory.sram = gb->sramVf->map(gb->sramVf, gb->sramSize, MAP_WRITE);
 	if (gb->sramMaskWriteback) {
+		vf->seek(vf, 0, SEEK_SET);
 		vf->read(vf, gb->memory.sram, gb->sramSize);
+		gb->sramMaskWriteback = false;
 	}
 	vf->close(vf);
 }
@@ -286,6 +291,7 @@ gb->memory.rom = NULL;
 	gb->memory.mbcType = GB_MBC_AUTODETECT;
 	gb->isPristine = false;
 
+	gb->sramMaskWriteback = false;
 	GBSavedataUnmask(gb);
 	GBSramDeinit(gb);
 	if (gb->sramRealVf) {

M src/gba/memory.c → src/gba/memory.c

@@ -90,6 +90,7 @@ mappedMemoryFree(gba->memory.iwram, SIZE_WORKING_IRAM);
 	if (gba->memory.rom) {
 		mappedMemoryFree(gba->memory.rom, gba->memory.romSize);
 	}
+	gba->memory.savedata.maskWriteback = false;
 	GBASavedataUnmask(&gba->memory.savedata);
 	GBASavedataDeinit(&gba->memory.savedata);
 	if (gba->memory.savedata.realVf) {