From 8fa13b6730a03d0bced4316c8a151ca85ab03edf Mon Sep 17 00:00:00 2001 From: Lee Fogg Date: Sun, 26 Apr 2020 12:15:53 +0100 Subject: [PATCH] Added cuard clauses back --- Emux.GameBoy/Cartridge/BufferedExternalMemory.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Emux.GameBoy/Cartridge/BufferedExternalMemory.cs b/Emux.GameBoy/Cartridge/BufferedExternalMemory.cs index 87a183f..2ff4335 100644 --- a/Emux.GameBoy/Cartridge/BufferedExternalMemory.cs +++ b/Emux.GameBoy/Cartridge/BufferedExternalMemory.cs @@ -55,17 +55,21 @@ namespace Emux.GameBoy.Cartridge public byte ReadByte(int address) { - return IsActive ? _externalMemory[address] : (byte)0; + if (_externalMemory != null && IsActive) + return _externalMemory[address]; + + return 0; } public void ReadBytes(int address, byte[] buffer, int offset, int length) { - Array.Copy(_externalMemory, address, buffer, 0, length); + if (_externalMemory != null) + Array.Copy(_externalMemory, address, buffer, 0, length); } public void WriteByte(int address, byte value) { - if (IsActive) + if (_externalMemory != null && IsActive) _externalMemory[address] = value; }