gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24155) -Fix: the music volume was set too early during startup; at a moment the configuration file wasn't read yet

Browse Source
This commit is contained in:
rubidium 2012-04-19 20:08:51 +00:00
parent ac284757d8
commit 27d9808f45
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openttd.cpp
View File

@ -429,6 +429,8 @@ struct AfterNewGRFScan : NewGRFScanCallback {
/* We have loaded the config, so we may possibly save it. */ /* We have loaded the config, so we may possibly save it. */
*save_config_ptr = save_config; *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 (startyear != INVALID_YEAR) _settings_newgame.game_creation.starting_year = startyear;
if (generation_seed != GENERATE_NEW_SEED) _settings_newgame.game_creation.generation_seed = generation_seed; 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); 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! */ /* Take our initial lock on whatever we might want to do! */
_modal_progress_paint_mutex->BeginCritical(); _modal_progress_paint_mutex->BeginCritical();
_modal_progress_work_mutex->BeginCritical(); _modal_progress_work_mutex->BeginCritical();