From 9451cf38f775af92178e107ae0bb8c92a46d4184 Mon Sep 17 00:00:00 2001
From: historic_bruno <ben@wildfiregames.com>
Date: Sun, 30 Aug 2015 21:31:03 +0000
Subject: [PATCH] Fixes Esc key opening options dialog in match setup,
 introduced by a964e83c79

This was SVN commit r16966.
---
 binaries/data/mods/public/gui/gamesetup/gamesetup.js  | 6 +++---
 binaries/data/mods/public/gui/gamesetup/gamesetup.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 8b86bb708a..81482ba4ce 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -1786,10 +1786,10 @@ function addChatMessage(msg)
 	Engine.GetGUIObjectByName("chatText").caption = g_ChatMessages.join("\n");
 }
 
-function toggleMoreOptions()
+function showMoreOptions(show)
 {
-	Engine.GetGUIObjectByName("moreOptionsFade").hidden = !Engine.GetGUIObjectByName("moreOptionsFade").hidden;
-	Engine.GetGUIObjectByName("moreOptions").hidden = !Engine.GetGUIObjectByName("moreOptions").hidden;
+	Engine.GetGUIObjectByName("moreOptionsFade").hidden = !show;
+	Engine.GetGUIObjectByName("moreOptions").hidden = !show;
 }
 
 function toggleReady()
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index dc366903a5..e194d068e5 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -262,7 +262,7 @@
 				>
 					<translatableAttribute id="caption">More Options</translatableAttribute>
 					<translatableAttribute id="tooltip">See more game options</translatableAttribute>
-					<action on="Press">toggleMoreOptions();</action>
+					<action on="Press">showMoreOptions(true);</action>
 				</object>
 
 			<!-- End Options -->
@@ -406,7 +406,7 @@
 				>
 					<translatableAttribute id="caption">OK</translatableAttribute>
 					<translatableAttribute id="tooltip">Close more game options window</translatableAttribute>
-					<action on="Press">toggleMoreOptions();</action>
+					<action on="Press">showMoreOptions(false);</action>
 				</object>
 			<!-- End More Options -->
 			</object>