From f08a0b38494122341e32e726a3781fb08e1bcc7c Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Wed, 24 Aug 2016 19:21:16 +0300
Subject: [PATCH] n64 tracer: disable for dynarec

---
 BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
index c351d2606e..d4c628e3cc 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
@@ -138,8 +138,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 			api.AttachPlugin(mupen64plusApi.m64p_plugin_type.M64PLUGIN_RSP, rsp);
 
 			InitMemoryDomains();
-			ConnectTracer();
 			RefreshMemoryCallbacks();
+			if (_syncSettings.Core != N64SyncSettings.CoreType.Dynarec)
+				ConnectTracer();
 
 			api.AsyncExecuteEmulator();
 
@@ -216,7 +217,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 
 			RefreshMemoryCallbacks();
 
-			if (Tracer.Enabled)
+			if (Tracer != null && Tracer.Enabled)
 			{
 				api.setTraceCallback(_tracecb);
 			}