Mercurial > hg > openttd
changeset 19266:bb5c1c46236e draft
(svn r24155) -Fix: the music volume was set too early during startup; at a moment the configuration file wasn't read yet
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Thu, 19 Apr 2012 20:08:51 +0000 |
| parents | 36921d3ba673 |
| children | c93a80f27c9d |
| files | src/openttd.cpp |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -429,6 +429,8 @@ /* 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 @@ } 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();