From e799eed64e7d1e00d9d167698e56b580bd1582fd Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Fri, 22 Apr 2022 16:26:33 -0300 Subject: [PATCH] don't call stop hook if we are not in the main thread anymore (likely caused by the exiting of the program) --- .../BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index 3c5df8cb7..bed614c39 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -338,7 +338,12 @@ namespace Barotrauma } foreach (var mod in ACsMod.LoadedMods.ToArray()) mod.Dispose(); ACsMod.LoadedMods.Clear(); - Hook?.Call("stop"); + + + if (Thread.CurrentThread == GameMain.MainThread) + { + Hook?.Call("stop"); + } Game?.Stop();