all repos — mgba @ 320ed402b735d77351e1e6a8849ca1263cf9243e

mGBA Game Boy Advance Emulator

GBA Savedata: Fix EEPROM writing codepath when savetype is not EEPROM
Vicki Pfau vi@endrift.com
Wed, 21 Nov 2018 23:10:37 -0500
commit

320ed402b735d77351e1e6a8849ca1263cf9243e

parent

5981c27fe0f19c6cc537bf97bca6479796447efb

3 files changed, 9 insertions(+), 2 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -127,6 +127,7 @@ - PSP2: Fix tearing issues (fixes mgba.io/i/1211)
  - Qt: Fix mapping analog triggers (fixes mgba.io/i/495)
  - Qt: Grab focus when game starts (fixes mgba.io/i/804)
  - Core: Remember to deinit proxy ring FIFO
+ - GBA Savedata: Fix EEPROM writing codepath when savetype is not EEPROM
 Misc:
  - mGUI: Add SGB border configuration option
  - mGUI: Add support for different settings types
M src/gba/dma.c → src/gba/dma.c 
@@ -282,7 +282,9 @@ if (memory->savedata.type == SAVEDATA_AUTODETECT) {
 				mLOG(GBA_MEM, INFO, "Detected EEPROM savegame");
 				GBASavedataInitEEPROM(&memory->savedata);
 			}
-			GBASavedataWriteEEPROM(&memory->savedata, memory->dmaTransferRegister, wordsRemaining);
+			if (memory->savedata.type == SAVEDATA_EEPROM) {
+				GBASavedataWriteEEPROM(&memory->savedata, memory->dmaTransferRegister, wordsRemaining);
+			}
 		} else {
 			cpu->memory.store16(cpu, dest, memory->dmaTransferRegister, 0);
M src/gba/memory.c → src/gba/memory.c 
@@ -892,7 +892,11 @@ if (memory->savedata.type == SAVEDATA_AUTODETECT) {
 			mLOG(GBA_MEM, INFO, "Detected EEPROM savegame");
 			GBASavedataInitEEPROM(&memory->savedata);
 		}
-		GBASavedataWriteEEPROM(&memory->savedata, value, 1);
+		if (memory->savedata.type == SAVEDATA_EEPROM) {
+			GBASavedataWriteEEPROM(&memory->savedata, value, 1);
+			break;
+		}
+		mLOG(GBA_MEM, GAME_ERROR, "Bad memory Store16: 0x%08X", address);
 		break;
 	case REGION_CART_SRAM:
 	case REGION_CART_SRAM_MIRROR: