space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try/catch blocks around BUI open/dispose calls (#5730)

Browse Source
This commit is contained in:
Whatstone
2025-03-07 23:16:11 -05:00
committed by GitHub
parent 41ea10083d
commit 3dda8d9e93
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs
View File

@@ -1064,11 +1064,11 @@ public abstract class SharedUserInterfaceSystem : EntitySystem
{
if (open)
{
bui.Open();
#if EXCEPTION_TOLERANCE
try
{
#endif
bui.Open();
if (UIQuery.TryComp(bui.Owner, out var uiComp))
{
@@ -1096,12 +1096,24 @@ public abstract class SharedUserInterfaceSystem : EntitySystem
uiComp.ClientOpenInterfaces.Remove(bui.UiKey);
}
#if EXCEPTION_TOLERANCE
try
{
#endif
if (!TerminatingOrDeleted(bui.Owner))
{
SavePosition(bui);
}
bui.Dispose();
#if EXCEPTION_TOLERANCE
}
catch (Exception e)
{
Log.Error(
$"Caught exception while attempting to dispose of a BUI {bui.UiKey} with type {bui.GetType()} on entity {ToPrettyString(bui.Owner)}. Exception: {e}");
}
#endif
}
}