From 6150a6d6971cc935b30157eb1b850fb96b126421 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Wed, 29 Jun 2022 15:24:34 +1200
Subject: [PATCH] Detach to null & icon smoothing (#9268)

---
 Content.Client/IconSmoothing/IconSmoothSystem.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs
index f37a5a8bb6..25fd5e8412 100644
--- a/Content.Client/IconSmoothing/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -155,10 +155,8 @@ namespace Content.Client.IconSmoothing
 
         private void OnAnchorChanged(EntityUid uid, IconSmoothComponent component, ref AnchorStateChangedEvent args)
         {
-            // Defer updating to next frame update. We do this because this unanchoring might be caused by a detach to
-            // null due to leaving PVS, in which case we can be a bit lazy. However, this event is raised before being
-            // sent to null-space, hence deferring.
-            _anchorChangedEntities.Enqueue(uid);
+            if (!args.Detaching)
+                _anchorChangedEntities.Enqueue(uid);
         }
 
         private void CalculateNewSprite(EntityUid uid,