From 5243530d813c695057c08027e024a0b4e7ec9cd7 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 26 Jan 2020 23:53:33 +0100
Subject: [PATCH] Fix crash on reconnect.

---
 .../GameObjects/EntitySystems/CombatModeSystem.cs          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
index 92cdf16b3c..8d73a4fa5a 100644
--- a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
@@ -48,6 +48,13 @@ namespace Content.Client.GameObjects.EntitySystems
             _overlayManager.AddOverlay(new CombatModeOverlay(this));
         }
 
+        public override void Shutdown()
+        {
+            base.Shutdown();
+
+            _overlayManager.RemoveOverlay(nameof(CombatModeOverlay));
+        }
+
         private bool IsInCombatMode()
         {
             var entity = _playerManager.LocalPlayer.ControlledEntity;