diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISaveRam.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISaveRam.cs index 57cb38fabe..b7fdd5b966 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISaveRam.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ISaveRam.cs @@ -6,12 +6,16 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES { public byte[] CloneSaveRam(bool clearDirty) { + if (!QN.qn_has_battery_ram(Context)) return null; + LibQuickNES.ThrowStringError(QN.qn_battery_ram_save(Context, _saveRamBuff, _saveRamBuff.Length)); return (byte[])_saveRamBuff.Clone(); } public void StoreSaveRam(byte[] data) { + if (!QN.qn_has_battery_ram(Context)) return; + LibQuickNES.ThrowStringError(QN.qn_battery_ram_load(Context, data, data.Length)); }