From cc5ff74689f545630190898d0e5cd63e23945338 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 23 Apr 2017 11:42:26 -0500
Subject: [PATCH] Fix debugger throwing exceptions on opened on a core that
 does not implement IDisassemblable

---
 .../tools/Debugger/GenericDebugger.Disassembler.cs           | 5 ++++-
 .../tools/Debugger/GenericDebugger.IToolForm.cs              | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
index 1e77d978b3..9617500bd7 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
@@ -37,7 +37,10 @@ namespace BizHawk.Client.EmuHawk
 
 		public void UpdatePC()
 		{
-			currentDisassemblerAddress = (uint)PCRegister.Value;
+			if (CanDisassemble)
+			{
+				currentDisassemblerAddress = (uint)PCRegister.Value;
+			}
 		}
 
 		private void UpdateDisassembler()
diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
index 2344f2f5b9..c43ea2c392 100644
--- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
+++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
@@ -28,6 +28,7 @@ namespace BizHawk.Client.EmuHawk
 
 		#region Implementation checking
 
+		// TODO: be cachey with checks that depend on catching exceptions
 		private bool CanUseMemoryCallbacks
 		{
 			get