From 5b731cf8b8ad9597152ac58c083072339790056e Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Fri, 16 Jun 2017 08:50:28 -0400 Subject: [PATCH] SNES saveram: check for existance checks if SGB saveram exists before attempting to assign it to the buffer pointer. Also return null if no saveram is found, which conforms to what other cores are doing and what EMUHawk expects --- .../Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs index 0cf3e94476..cb1ffdfb68 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.ISaveRam.cs @@ -15,11 +15,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES { byte* buf = Api.QUERY_get_memory_data(LibsnesApi.SNES_MEMORY.CARTRIDGE_RAM); var size = Api.QUERY_get_memory_size(LibsnesApi.SNES_MEMORY.CARTRIDGE_RAM); - if (buf == null) + + if (buf == null && Api.QUERY_get_memory_size(LibsnesApi.SNES_MEMORY.SGB_CARTRAM)>0) { buf = Api.QUERY_get_memory_data(LibsnesApi.SNES_MEMORY.SGB_CARTRAM); size = Api.QUERY_get_memory_size(LibsnesApi.SNES_MEMORY.SGB_CARTRAM); } + if (buf==null) + { + return null; + } var ret = new byte[size]; Marshal.Copy((IntPtr)buf, ret, 0, size);