From 86db66cac195455f9c8f987128478995efbaf6cb Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Thu, 23 Aug 2018 17:57:43 +0000
Subject: [PATCH] Allow players to instantly reset the readystate by
 rightclicking on the ready button, refs #4369, D49 / 5f8f7bae20.

This was SVN commit r21873.
---
 binaries/data/mods/public/gui/gamesetup/gamesetup.js  | 10 ++++++++++
 binaries/data/mods/public/gui/gamesetup/gamesetup.xml |  9 +--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index cbf130c29a..42fc6460de 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -1011,6 +1011,16 @@ var g_MiscControls = {
 	"startGame": {
 		"caption": () =>
 			g_IsController ? translate("Start Game!") : g_ReadyData[g_IsReady].caption,
+		"onPress": () => function() {
+			if (g_IsController)
+				launchGame();
+			else
+				toggleReady();
+		},
+		"onPressRight": () => function() {
+			if (!g_IsController && g_IsReady)
+				setReady(0, true);
+		},
 		"tooltip": (hoverIdx) =>
 			!g_IsController ?
 				g_ReadyData[g_IsReady].tooltip :
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index fc79682f76..08ba59e8a3 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -266,14 +266,7 @@
 				size="100%-164 100%-52 100%-24 100%-24"
 				tooltip_style="onscreenToolTip"
 				z="21"
-			>
-				<action on="Press">
-					if (g_IsController)
-						launchGame();
-					else
-						toggleReady();
-				</action>
-			</object>
+			/>
 
 			<!-- Cancel Button -->
 			<object