From a6931e5773c0fe1f34217bb692630d7d250d75ee Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Fri, 24 Jul 2020 20:18:42 +0200
Subject: [PATCH] Fix crash when clicking a deleted entity in the dropdown list
 (#1475)

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

diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
index 69ceade1f0..0009680a3a 100644
--- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
@@ -443,6 +443,13 @@ namespace Content.Client.GameObjects.EntitySystems
                 if (args.Function == EngineKeyFunctions.Use ||
                     args.Function == ContentKeyFunctions.Point)
                 {
+                    // TODO: Remove an entity from the menu when it is deleted
+                    if (_entity.Deleted)
+                    {
+                        _master.CloseAllMenus();
+                        return;
+                    }
+
                     var inputSys = _master.EntitySystemManager.GetEntitySystem<InputSystem>();
 
                     var func = args.Function;