From 49ca719049d0da89b59ffe255a3e27565bc982c6 Mon Sep 17 00:00:00 2001
From: sanderd17 <sanderd17@wildfiregames.com>
Date: Mon, 2 Jun 2014 15:13:16 +0000
Subject: [PATCH] Reinitialize music when hotloading. Fixes crash when
 hotloading GUI files.

This was SVN commit r15271.
---
 .../data/mods/public/gui/session/session.js     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index 27048d887d..d6282a79aa 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -223,17 +223,14 @@ function init(initData, hotloadData)
 	{
 		g_Selection.selected = hotloadData.selection;
 	}
-	else
-	{
-		// Starting for the first time:
-		initMusic();
-		if (!g_IsObserver){
-			var civMusic = g_CivData[g_Players[Engine.GetPlayerID()].civ].Music;
-			global.music.storeTracks(civMusic);
-		}
-		global.music.setState(global.music.states.PEACE);
-		playRandomAmbient("temperate");
+	// Starting for the first time:
+	initMusic();
+	if (!g_IsObserver){
+		var civMusic = g_CivData[g_Players[Engine.GetPlayerID()].civ].Music;
+		global.music.storeTracks(civMusic);
 	}
+	global.music.setState(global.music.states.PEACE);
+	playRandomAmbient("temperate");
 
 	if (Engine.ConfigDB_GetValue("user", "gui.session.timeelapsedcounter") === "true")
 		Engine.GetGUIObjectByName("timeElapsedCounter").hidden = false;