diff --git a/BizHawk.Client.Common/lua/LuaFunctionList.cs b/BizHawk.Client.Common/lua/LuaFunctionList.cs index 359c044985..f49d425145 100644 --- a/BizHawk.Client.Common/lua/LuaFunctionList.cs +++ b/BizHawk.Client.Common/lua/LuaFunctionList.cs @@ -23,7 +23,7 @@ namespace BizHawk.Client.Common Global.Emulator.AsInputPollable().InputCallbacks.Remove(function.Callback); } - if (Global.Emulator.CanDebug()) + if (Global.Emulator.CanDebug() && Global.Emulator.MemoryCallbacksAvailable()) { Global.Emulator.AsDebuggable().MemoryCallbacks.Remove(function.Callback); }