From cd43bf118b2b161de0e64621807b0f2d7da63146 Mon Sep 17 00:00:00 2001
From: joncloud <jdberube@gmail.com>
Date: Sun, 16 Mar 2014 13:45:01 -0700
Subject: [PATCH] Fixed #4697 - Added lobby disconnect hotkey, and renamed the
 button for single player.

Fixed #4697 - Corrected a misspelled hotkey.
---
 OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 3 +++
 mods/cnc/chrome/lobby.yaml                 | 1 +
 mods/ra/chrome/lobby.yaml                  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
index ad24f1ccf2..5d3314dd29 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/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");
diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml
index 0f96caf2f1..f31a7b2452 100644
--- a/mods/cnc/chrome/lobby.yaml
+++ b/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
diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml
index c85925b232..ab6c67213d 100644
--- a/mods/ra/chrome/lobby.yaml
+++ b/mods/ra/chrome/lobby.yaml
@@ -164,4 +164,5 @@ Background@SERVER_LOBBY:
 			Height:25
 			Text:Disconnect
 			Font:Bold
+			Key: escape
 		TooltipContainer@TOOLTIP_CONTAINER:
\ No newline at end of file