From 1b529666e6ecea1f9693172a4b3613bb414109cd Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 9 Nov 2024 15:37:43 -0500 Subject: [PATCH] Cherry-Pick Wizden PR 28375 (#1191) # Description Cherry-picks https://github.com/space-wizards/space-station-14/pull/28375/ to fix an issue with BUIs closing themselves. Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- Content.Shared/Interaction/SharedInteractionSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 940d8ffbb0..4c22bcb14e 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -159,7 +159,7 @@ private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev if (uiComp == null) return; - if (uiComp.SingleUser && uiComp.CurrentSingleUser != ev.Actor) + if (uiComp.SingleUser && uiComp.CurrentSingleUser != null && uiComp.CurrentSingleUser != ev.Actor) { ev.Cancel(); return;