Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
This commit is contained in:
commit
17678387c3
|
@ -944,18 +944,6 @@ void MenuStateOptionsGraphics::saveConfig(){
|
|||
LuaScript::setDisableSandbox(true);
|
||||
}
|
||||
|
||||
SoundRenderer &soundRenderer= SoundRenderer::getInstance();
|
||||
soundRenderer.stopAllSounds();
|
||||
program->stopSoundSystem();
|
||||
soundRenderer.init(program->getWindow());
|
||||
soundRenderer.loadConfig();
|
||||
soundRenderer.setMusicVolume(CoreData::getInstance().getMenuMusic());
|
||||
program->startSoundSystem();
|
||||
|
||||
if(CoreData::getInstance().hasMainMenuVideoFilename() == false) {
|
||||
soundRenderer.playMusic(CoreData::getInstance().getMenuMusic());
|
||||
}
|
||||
|
||||
Renderer::getInstance().loadConfig();
|
||||
console.addLine(lang.getString("SettingsSaved"));
|
||||
}
|
||||
|
|
|
@ -523,18 +523,6 @@ void MenuStateOptionsNetwork::saveConfig(){
|
|||
|
||||
config.save();
|
||||
|
||||
SoundRenderer &soundRenderer= SoundRenderer::getInstance();
|
||||
soundRenderer.stopAllSounds();
|
||||
program->stopSoundSystem();
|
||||
soundRenderer.init(program->getWindow());
|
||||
soundRenderer.loadConfig();
|
||||
soundRenderer.setMusicVolume(CoreData::getInstance().getMenuMusic());
|
||||
program->startSoundSystem();
|
||||
|
||||
if(CoreData::getInstance().hasMainMenuVideoFilename() == false) {
|
||||
soundRenderer.playMusic(CoreData::getInstance().getMenuMusic());
|
||||
}
|
||||
|
||||
Renderer::getInstance().loadConfig();
|
||||
console.addLine(lang.getString("SettingsSaved"));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue