From b8a410a36997e6767a070efee7d9487dcbe98a82 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Fri, 3 Dec 2021 14:37:52 +1300 Subject: [PATCH] Fix entity menu sometimes not opening properly. (#5673) --- Content.Client/ContextMenu/UI/EntityMenuPresenter.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs b/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs index 83f1e33e50..bead833a70 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuPresenter.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using Content.Client.Examine; -using Content.Client.Items.Managers; using Content.Client.Verbs; using Content.Client.Viewport; using Content.Shared.CCVar; @@ -33,7 +32,6 @@ namespace Content.Client.ContextMenu.UI public sealed partial class EntityMenuPresenter : ContextMenuPresenter { [Dependency] private readonly IEntitySystemManager _systemManager = default!; - [Dependency] private readonly IItemSlotManager _itemSlotManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IStateManager _stateManager = default!; @@ -80,6 +78,10 @@ namespace Content.Client.ContextMenu.UI /// public void OpenRootMenu(List entities) { + // close any old menus first. + if (RootMenu.Visible) + Close(); + var entitySpriteStates = GroupEntities(entities); var orderedStates = entitySpriteStates.ToList(); orderedStates.Sort((x, y) => string.CompareOrdinal(x.First().Prototype?.Name, y.First().Prototype?.Name));