Fix crash when clicking a deleted entity in the dropdown list (#1475)

2020-07-24 20:18:42 +02:00
parent 245dbdaa3a
commit a6931e5773
1 changed files with 7 additions and 0 deletions
--- 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;