From 84495c3d524a211863884830b1a6301ba5b7728d Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:07:43 +1200 Subject: [PATCH] Don't show verb confirmation pop-ups in debug mode (#20300) --- .../Verbs/UI/VerbMenuUIController.cs | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs index 08a16b49fd..6347564ec8 100644 --- a/Content.Client/Verbs/UI/VerbMenuUIController.cs +++ b/Content.Client/Verbs/UI/VerbMenuUIController.cs @@ -216,21 +216,25 @@ namespace Content.Client.Verbs.UI return; } - if (verb.ConfirmationPopup) - { - if (verbElement.SubMenu == null) - { - var popupElement = new ConfirmationMenuElement(verb, "Confirm"); - verbElement.SubMenu = new ContextMenuPopup(_context, verbElement); - _context.AddElement(verbElement.SubMenu, popupElement); - } - - _context.OpenSubMenu(verbElement); - } - else +#if DEBUG + // No confirmation pop-ups in debug mode. + ExecuteVerb(verb); +#else + if (!verb.ConfirmationPopup) { ExecuteVerb(verb); + return; } + + if (verbElement.SubMenu == null) + { + var popupElement = new ConfirmationMenuElement(verb, "Confirm"); + verbElement.SubMenu = new ContextMenuPopup(_context, verbElement); + _context.AddElement(verbElement.SubMenu, popupElement); + } + + _context.OpenSubMenu(verbElement); +#endif } private void Close()