From 09e8c7a9b684d29a595ba9d395f5f146a91e02a8 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Fri, 2 Sep 2022 15:11:34 -0700
Subject: [PATCH] ensure ds firmware settings represent sync settings if real
 firmware isn't used

resolves possible cause for #3377
---
 src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
index 99cca0a72c..3f1849bec2 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
@@ -106,7 +106,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 				loadFlags |= LibMelonDS.LoadFlags.SKIP_FIRMWARE;
 			if (gbacartpresent)
 				loadFlags |= LibMelonDS.LoadFlags.GBA_CART_PRESENT;
-			if (_syncSettings.FirmwareOverride || lp.DeterministicEmulationRequested)
+			if (fw is null || _syncSettings.FirmwareOverride || lp.DeterministicEmulationRequested)
 				loadFlags |= LibMelonDS.LoadFlags.FIRMWARE_OVERRIDE;
 			if (IsDSi)
 				loadFlags |= LibMelonDS.LoadFlags.IS_DSI;