diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index d473f6a9d..29ff74305 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -320,6 +320,10 @@ namespace Barotrauma public DynValue CallLuaFunction(object function, params object[] args) { + // XXX: `lua` might be null if `LuaCsSetup.Stop()` is called while + // a patched function is still running. + if (lua == null) return null; + lock (lua) { try