From 7a5408995e093df7d9c26150baa2a8c8e8193ecc Mon Sep 17 00:00:00 2001 From: nattthebear Date: Thu, 14 Jan 2021 19:24:06 -0500 Subject: [PATCH] sameboy: a bit more cleanup with the printer callback --- .../Consoles/Nintendo/Gameboy/Sameboy.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs index 3e4307d904..59ec6a3b99 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs @@ -302,7 +302,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy protected override void LoadStateBinaryInternal(BinaryReader reader) { UpdateCoreScanlineCallback(false); - _core.SetPrinterCallback(_corePrinterCallback); + UpdateCorePrinterCallback(); } public bool IsCGBMode() => _cgb; @@ -400,7 +400,12 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy public void SetPrinterCallback(PrinterCallback callback) { _frontendPrinterCallback = callback; - _core.SetPrinterCallback(callback != null ? _corePrinterCallback : null); + UpdateCorePrinterCallback(); + } + + private void UpdateCorePrinterCallback() + { + _core.SetPrinterCallback(_frontendPrinterCallback != null ? _corePrinterCallback : null); } } }