From 27d9808f45d555961d8e4cf7b4d3ffafbd419a5b Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 19 Apr 2012 20:08:51 +0000 Subject: [PATCH] (svn r24155) -Fix: the music volume was set too early during startup; at a moment the configuration file wasn't read yet --- src/openttd.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/openttd.cpp b/src/openttd.cpp index 155dd9cf2e..9ef5b5a288 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -429,6 +429,8 @@ struct AfterNewGRFScan : NewGRFScanCallback { /* We have loaded the config, so we may possibly save it. */ *save_config_ptr = save_config; + /* restore saved music volume */ + _music_driver->SetVolume(_settings_client.music.music_vol); if (startyear != INVALID_YEAR) _settings_newgame.game_creation.starting_year = startyear; if (generation_seed != GENERATE_NEW_SEED) _settings_newgame.game_creation.generation_seed = generation_seed; @@ -815,9 +817,6 @@ int ttd_main(int argc, char *argv[]) } free(musicdriver); - /* restore saved music volume */ - _music_driver->SetVolume(_settings_client.music.music_vol); - /* Take our initial lock on whatever we might want to do! */ _modal_progress_paint_mutex->BeginCritical(); _modal_progress_work_mutex->BeginCritical();