From 35d68050100814374f5f4eeff7ddf127ab5c75ab Mon Sep 17 00:00:00 2001
From: Matei <matei@wildfiregames.com>
Date: Sun, 8 Oct 2006 02:51:16 +0000
Subject: [PATCH] # Added return-to-menu hotkey.

This was SVN commit r4518.
---
 binaries/data/mods/official/gui/test/4_session.xml     | 10 ++++++++++
 .../official/gui/test/functions_page_pregame_load.js   |  4 ++--
 .../mods/official/gui/test/functions_page_session.js   |  6 +++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index 469e9f6f5c..5c1e046194 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -27,6 +27,16 @@
 			]]></action>
 		</object>
 
+		<!-- EMPTY OBJECT USED TO RETURN TO MAIN MENU. -->
+		<object name="snReturn"
+			hotkey="menu.resign"
+		>
+			<action on="Press"><![CDATA[
+				console.write("Returning to main menu!");
+				endSession("return");
+			]]></action>
+		</object>
+		
 		<!-- EMPTY OBJECT USED TO TOGGLE WATER RENDERING. -->
 		<object name="snWaterToggle"
 			hotkey="water.toggle"
diff --git a/binaries/data/mods/official/gui/test/functions_page_pregame_load.js b/binaries/data/mods/official/gui/test/functions_page_pregame_load.js
index 415f7ab47c..bf46707c91 100644
--- a/binaries/data/mods/official/gui/test/functions_page_pregame_load.js
+++ b/binaries/data/mods/official/gui/test/functions_page_pregame_load.js
@@ -155,8 +155,8 @@ function endSession (closeType)
 		endGame();
 		
 		// Fade out current music and return to playing menu theme.
-		curr_music = newRandomSound("music", "menu");
-		crossFade(curr_session_playlist_1, curr_music, 1);
+		//curr_music = newRandomSound("music", "menu");
+		//crossFade(curr_session_playlist_1, curr_music, 1);
 
 		// Stop refreshing the session controls.
 		cancelInterval();
diff --git a/binaries/data/mods/official/gui/test/functions_page_session.js b/binaries/data/mods/official/gui/test/functions_page_session.js
index c4f2214de0..739668543e 100644
--- a/binaries/data/mods/official/gui/test/functions_page_session.js
+++ b/binaries/data/mods/official/gui/test/functions_page_session.js
@@ -350,6 +350,9 @@ function snRefresh()
 		
 		// Refresh handler that monitors whether property/selection has been updated.
 		resetUpdateVars();
+		
+		// Refresh resources
+		refreshResources();
 	}
 
 	if ( selectionChanged && getGUIObjectByName( "mn" ).hidden == false)
@@ -357,9 +360,6 @@ function snRefresh()
 		// Update manual if it's open.
 		refreshManual();
 	}
-	
-	// Always refresh resources
-	refreshResources();
 }
 
 // ====================================================================
\ No newline at end of file