Merge pull request #4881 from joncloud/bleed

Fixed #4697 disconnect button label in single-player

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

@@ -441,6 +441,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			var disconnectButton = lobby.Get<ButtonWidget>("DISCONNECT_BUTTON");
 			disconnectButton.OnClick = () => { CloseWindow(); onExit(); };
 
+			if (this.skirmishMode)
+				disconnectButton.Text = "Cancel";
+
 			bool teamChat = false;
 			var chatLabel = lobby.Get<LabelWidget>("LABEL_CHATTYPE");
 			var chatTextField = lobby.Get<TextFieldWidget>("CHAT_TEXTFIELD");

mods/cnc/chrome/lobby.yaml

@@ -161,6 +161,7 @@ Container@SERVER_LOBBY:
 			Width:140
 			Height:35
 			Text:Leave Game
+			Key: escape
 		Button@MUSIC_BUTTON:
 			X:450
 			Y:499

mods/ra/chrome/lobby.yaml

@@ -164,4 +164,5 @@ Background@SERVER_LOBBY:
 			Height:25
 			Text:Disconnect
 			Font:Bold
+			Key: escape
 		TooltipContainer@TOOLTIP_CONTAINER: