Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Reinitialize music when hotloading. Fixes crash when hotloading GUI files.

Browse Source 
This was SVN commit r15271.
This commit is contained in:
sanderd17 2014-06-02 15:13:16 +00:00
parent a63ed4e4c4
commit 49ca719049
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
binaries/data/mods/public/gui/session/session.js
View File

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