Merge pull request #10509 from pchote/cancel-pbog-on-menu

Cancel custom input modes when opening the menu.
2016-01-14 20:29:30 +01:00
parent 3128bec301 06678ecc0d
commit da4f04acfb
1 changed files with 5 additions and 0 deletions
--- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs
@@ -98,7 +98,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var cachedPause = world.PredictedPaused;

 			if (button.HideIngameUI)
+			{
+				// Cancel custom input modes (guard, building placement, etc)
+				world.CancelInputMode();
+
 				worldRoot.IsVisible = () => false;
+			}

 			if (button.Pause && world.LobbyInfo.IsSinglePlayer)
 				world.SetPauseState(true);