From 95467c232727044e7d88e83ed623cb202fe9aaf4 Mon Sep 17 00:00:00 2001
From: abian <wildfiregames@abian.casa>
Date: Sat, 18 Oct 2025 09:32:10 +0200
Subject: [PATCH] Hide Abort Unit Order button when idle or guarding

Reviewed-By: bb
Fixes #6854
---
 binaries/data/mods/public/gui/session/unit_actions.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/binaries/data/mods/public/gui/session/unit_actions.js b/binaries/data/mods/public/gui/session/unit_actions.js
index f572e0bfa2..597dd37187 100644
--- a/binaries/data/mods/public/gui/session/unit_actions.js
+++ b/binaries/data/mods/public/gui/session/unit_actions.js
@@ -1550,7 +1550,8 @@ var g_EntityCommands =
 	"stop": {
 		"getInfo": function(entStates)
 		{
-			if (entStates.every(entState => !entState.unitAI))
+			// Don't show generic option to abort if not applicable or in case of guard, which has its own abort action
+			if (entStates.every(entState => !entState.unitAI || entState.unitAI.isIdle || entState.unitAI.isGuarding))
 				return false;
 
 			return {