From e179e89c031dc5cff098b7021fba6891d2bf10d9 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 4 Dec 2019 01:23:14 +0100
Subject: [PATCH] Fix crash on shutting down client.

---
 .../Components/HUD/Inventory/ClientInventoryComponent.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
index c1f304c088..c7d71e903d 100644
--- a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
+++ b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
@@ -30,11 +30,16 @@ namespace Content.Client.GameObjects
 
         private ISpriteComponent _sprite;
 
+        private bool _playerAttached = false;
+
         public override void OnRemove()
         {
             base.OnRemove();
 
-            InterfaceController?.PlayerDetached();
+            if (_playerAttached)
+            {
+                InterfaceController?.PlayerDetached();
+            }
             InterfaceController?.Dispose();
         }
 
@@ -153,10 +158,12 @@ namespace Content.Client.GameObjects
             {
                 case PlayerAttachedMsg _:
                     InterfaceController.PlayerAttached();
+                    _playerAttached = true;
                     break;
 
                 case PlayerDetachedMsg _:
                     InterfaceController.PlayerDetached();
+                    _playerAttached = false;
                     break;
             }
         }