From f3dc168dbd733cf650005f26f197fe655346c9d7 Mon Sep 17 00:00:00 2001
From: Gustas <37534529+PunkPun@users.noreply.github.com>
Date: Sat, 17 Dec 2022 20:06:57 +0200
Subject: [PATCH] Don't cancel guard cursor when holding shift

---
 OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs b/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
index 9196fb022d..8c75406217 100644
--- a/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
+++ b/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
@@ -45,9 +45,10 @@ namespace OpenRA.Mods.Common.Orders
 			if (target == null)
 				yield break;
 
-			world.CancelInputMode();
-
 			var queued = mi.Modifiers.HasModifier(Modifiers.Shift);
+			if (!queued)
+				world.CancelInputMode();
+
 			yield return new Order(orderName, null, Target.FromActor(target), queued, null, subjects.Where(s => s != target).ToArray());
 		}