diff options
| author | rubidium <rubidium@openttd.org> | 2012-04-19 20:08:51 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2012-04-19 20:08:51 +0000 |
| commit | 27d9808f45d555961d8e4cf7b4d3ffafbd419a5b (patch) | |
| tree | e9ab5d5d4a861192c06aed9f6e9c39f4e6e6149e /src | |
| parent | ac284757d8801781bc4360d71245b27eb46d285c (diff) | |
| download | openttd-27d9808f45d555961d8e4cf7b4d3ffafbd419a5b.tar.xz | |
(svn r24155) -Fix: the music volume was set too early during startup; at a moment the configuration file wasn't read yet
Diffstat (limited to 'src')
| -rw-r--r-- | src/openttd.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 155dd9cf2..9ef5b5a28 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(); |