From c20df3e39ffd3b28db499bcc4a0e1fb48b563826 Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Sun, 5 May 2024 18:38:55 -0700 Subject: [PATCH] Fix AlertControl throwing an error if the sprite view entity is deleted multiple times (#27690) * Fix AlertControl throwing an error if disposed multiple times * Replace default check with deleted check --- .../UserInterface/Systems/Alerts/Controls/AlertControl.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs index af93033a9d..6327757dec 100644 --- a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs +++ b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs @@ -3,7 +3,6 @@ using Content.Client.Actions.UI; using Content.Client.Cooldown; using Content.Shared.Alert; using Robust.Client.GameObjects; -using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Timing; @@ -117,7 +116,9 @@ namespace Content.Client.UserInterface.Systems.Alerts.Controls protected override void Dispose(bool disposing) { base.Dispose(disposing); - _entityManager.QueueDeleteEntity(_spriteViewEntity); + + if (!_entityManager.Deleted(_spriteViewEntity)) + _entityManager.QueueDeleteEntity(_spriteViewEntity); } } -- 2.52.0