From 1ef2407d0253ebed15be2fb51658a7a2420837d8 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Tue, 10 May 2022 19:37:02 +1000
Subject: [PATCH] Fix popup deletion raycasts (#8072)

* Fix popup deletion raycasts

* woops
---
 Content.Client/Popups/PopupSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index 9c1eec3a76..b027b48415 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -145,7 +145,8 @@ namespace Content.Client.Popups
             for (var i = _aliveLabels.Count - 1; i >= 0; i--)
             {
                 var label = _aliveLabels[i];
-                if (label.TotalTime > PopupLifetime)
+                if (label.TotalTime > PopupLifetime ||
+                    label.Entity != null && Deleted(label.Entity))
                 {
                     label.Dispose();
                     _aliveLabels.RemoveAt(i);