From 275837735192e727ff17b9c4351d159ff3824c2e Mon Sep 17 00:00:00 2001
From: Flipp Syder <76629141+vulppine@users.noreply.github.com>
Date: Wed, 15 Jun 2022 00:40:32 -0700
Subject: [PATCH] fixes static not appearing inbetween camera changes
 client-side (#8846)

---
 .../SurveillanceCameraMonitorSystem.cs                | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/Content.Client/SurveillanceCamera/SurveillanceCameraMonitorSystem.cs b/Content.Client/SurveillanceCamera/SurveillanceCameraMonitorSystem.cs
index 31fe357427..c946062128 100644
--- a/Content.Client/SurveillanceCamera/SurveillanceCameraMonitorSystem.cs
+++ b/Content.Client/SurveillanceCamera/SurveillanceCameraMonitorSystem.cs
@@ -4,8 +4,6 @@ namespace Content.Client.SurveillanceCamera;
 
 public sealed class SurveillanceCameraMonitorSystem : EntitySystem
 {
-    private readonly RemQueue<EntityUid> _toRemove = new();
-
     public override void Update(float frameTime)
     {
         foreach (var comp in EntityQuery<ActiveSurveillanceCameraMonitorVisualsComponent>())
@@ -24,16 +22,9 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
                     comp.OnFinish();
                 }
 
-                _toRemove.Add(comp.Owner);
+                EntityManager.RemoveComponentDeferred<ActiveSurveillanceCameraMonitorVisualsComponent>(comp.Owner);
             }
         }
-
-        foreach (var uid in _toRemove)
-        {
-            EntityManager.RemoveComponent<ActiveSurveillanceCameraMonitorVisualsComponent>(uid);
-        }
-
-        _toRemove.List?.Clear();
     }
 
     public void AddTimer(EntityUid uid, Action onFinish)