Fix OverlayManager.RemoveOverlay (#5623)

space-wizards · Jan 20, 2025 · 4ba6687 · 4ba6687
1 parent 8f2817a
commit 4ba6687
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -43,7 +43,7 @@ END TEMPLATE-->
 
 ### Bugfixes
 
-*None yet*
+* Fixed one of the `IOverlayManager.RemoveOverlay` overrides not fully removing the overlay.
 
 ### Other
 

diff --git a/Robust.Client/Graphics/Overlays/OverlayManager.cs b/Robust.Client/Graphics/Overlays/OverlayManager.cs
@@ -40,10 +40,9 @@ public void FrameUpdate(FrameEventArgs args)
 
     public bool AddOverlay(Overlay overlay)
     {
-        if (_overlays.ContainsKey(overlay.GetType()))
+        if (!_overlays.TryAdd(overlay.GetType(), overlay))
             return false;
 
-        _overlays.Add(overlay.GetType(), overlay);
         Sort();
         return true;
     }
@@ -68,7 +67,7 @@ public bool RemoveOverlay<T>() where T : Overlay
 
     public bool RemoveOverlay(Overlay overlay)
     {
-        return _overlays.Remove(overlay.GetType());
+        return RemoveOverlay(overlay.GetType());
     }
 
     public bool TryGetOverlay(Type overlayClass, [NotNullWhen(true)] out Overlay? overlay)