Skip to content

Commit ddba1f2

Browse files
Fix NRE when JIT is enabled for melonDS
1 parent d9ae6d9 commit ddba1f2

File tree

1 file changed

+2
-1
lines changed
  • src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS

1 file changed

+2
-1
lines changed

src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,8 @@ protected override LibWaterboxCore.FrameInfo FrameAdvancePrep(IController contro
781781
_openGLProvider.ActivateGLContext(_glContext);
782782
}
783783

784-
_core.SetTraceCallback(Tracer.IsEnabled() ? _traceCallback : null, _settings.GetTraceMask());
784+
var isTracing = Tracer?.IsEnabled() ?? false;
785+
_core.SetTraceCallback(isTracing ? _traceCallback : null, _settings.GetTraceMask());
785786

786787
if (controller.IsPressed("Power"))
787788
{

0 commit comments

Comments
 (0)