vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix crash if a cs mod errors in the dispose method

Browse Source
This commit is contained in:
Evil Factory
2022-07-07 09:52:29 -03:00
parent bf0ea54cdd
commit e73cd0f398
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/ACsMod.cs
View File

@@ -29,8 +29,17 @@ namespace Barotrauma
LoadedMods.Add(this);
}
public void Dispose() {
Stop();
public void Dispose()
{
try
{
Stop();
}
catch (Exception e)
{
GameMain.LuaCs.HandleException(e, null, LuaCsSetup.ExceptionType.CSharp);
}
LoadedMods.Remove(this);
IsDisposed = true;
}

8
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
View File

@@ -318,9 +318,13 @@ namespace Barotrauma
{
UserData.UnregisterType(type, true);
}
foreach (var mod in ACsMod.LoadedMods.ToArray()) mod.Dispose();
ACsMod.LoadedMods.Clear();
foreach (var mod in ACsMod.LoadedMods.ToArray())
{
mod.Dispose();
}
ACsMod.LoadedMods.Clear();
if (Thread.CurrentThread == GameMain.MainThread)
{