Hide ingame menu before showing the confirmation dialog

As a bonus, don't show the confirmation dialog if the game is over.

OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs

@@ -19,18 +19,35 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		[ObjectCreator.UseCtor]
 		public IngameMenuLogic(Widget widget, World world, Action onExit, WorldRenderer worldRenderer)
 		{
+			Action onQuit = () =>
+			{
+				onExit();
+				LeaveGame(world);
+			};
+			Action onSurrender = () =>
+			{
+				world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false));
+				onExit();
+			};
+
 			widget.Get<ButtonWidget>("DISCONNECT").OnClick = () =>
 			{
-				ConfirmationDialogs.PromptConfirmAction(
+				bool gameOver = world.LocalPlayer != null && world.LocalPlayer.WinState != WinState.Undefined;
-					"Abort Mission",
+
-					"Leave this game and return to the menu?",
+				if (gameOver)
-					() =>
+				{
-					{
+					onQuit();
-						onExit();
+				}
-						LeaveGame(world);
+				else
-					},
+				{
-					null,
+					widget.Visible = false;
-					"Abort");
+					ConfirmationDialogs.PromptConfirmAction(
+						"Abort Mission",
+						"Leave this game and return to the menu?",
+						onQuit,
+						() => widget.Visible = true,
+						"Abort");
+				}
 			};
 
 			widget.Get<ButtonWidget>("SETTINGS").OnClick = () =>
@@ -52,15 +69,12 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 
 			widget.Get<ButtonWidget>("SURRENDER").OnClick = () =>
 			{
+				widget.Visible = false;
 				ConfirmationDialogs.PromptConfirmAction(
 					"Surrender",
 					"Are you sure you want to surrender?",
-					() =>
+					onSurrender,
-					{
+					() => widget.Visible = true,
-						world.IssueOrder(new Order("Surrender", world.LocalPlayer.PlayerActor, false));
-						onExit();
-					},
-					null,
 					"Surrender");
 			};
 			widget.Get("SURRENDER").IsVisible = () => world.LocalPlayer != null && world.LocalPlayer.WinState == WinState.Undefined;