From 096500d99ac4e0e0fee7391e414c2486bbdbcfc6 Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Mon, 23 Apr 2018 09:33:03 +0000
Subject: [PATCH] Toggle the visibility of the session GUI instantly, rather
 than waiting possibly indefinitely for the next simulation turn.

Differential Revision: https://code.wildfiregames.com/D1464
Reviewed By: bb
This was SVN commit r21765.
---
 binaries/data/mods/public/gui/session/hotkeys/misc.xml | 2 +-
 binaries/data/mods/public/gui/session/session.js       | 8 +++++++-
 binaries/data/mods/public/gui/session/session.xml      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/binaries/data/mods/public/gui/session/hotkeys/misc.xml b/binaries/data/mods/public/gui/session/hotkeys/misc.xml
index ad76a0fc32..5a02651dda 100644
--- a/binaries/data/mods/public/gui/session/hotkeys/misc.xml
+++ b/binaries/data/mods/public/gui/session/hotkeys/misc.xml
@@ -17,7 +17,7 @@
 	</object>
 
 	<object hotkey="session.gui.toggle">
-		<action on="Press">g_ShowGUI = !g_ShowGUI;</action>
+		<action on="Press">toggleGUI();</action>
 	</object>
 
 	<object hotkey="session.gui.menu.toggle">
diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index 5b37f94055..240b083f0a 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -933,11 +933,17 @@ function confirmExit()
 	g_ConfirmExit = false;
 }
 
+function toggleGUI()
+{
+	g_ShowGUI = !g_ShowGUI;
+	updateCinemaPath();
+}
+
 function updateCinemaPath()
 {
 	let isPlayingCinemaPath = GetSimState().cinemaPlaying && !g_Disconnected;
 
-	Engine.GetGUIObjectByName("sn").hidden = !g_ShowGUI || isPlayingCinemaPath;
+	Engine.GetGUIObjectByName("session").hidden = !g_ShowGUI || isPlayingCinemaPath;
 	Engine.Renderer_SetSilhouettesEnabled(!isPlayingCinemaPath && Engine.ConfigDB_GetValue("user", "silhouettes") == "true");
 }
 
diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index cfe166a857..c1c0e68034 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -5,7 +5,7 @@
 <script directory="gui/common/"/>
 <script directory="gui/session/"/>
 
-<object name="sn">
+<object name="session">
 
 	<action on="Tick">
 		onTick();