From b36c6cd75c8ad62049612ed9372966081d3ca4b9 Mon Sep 17 00:00:00 2001 From: titiger Date: Thu, 7 Jan 2016 01:33:48 +0100 Subject: [PATCH] no need for sound initialisation in non audio menus --- .../glest_game/menu/menu_state_options_graphics.cpp | 12 ------------ .../glest_game/menu/menu_state_options_network.cpp | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/source/glest_game/menu/menu_state_options_graphics.cpp b/source/glest_game/menu/menu_state_options_graphics.cpp index d25a9f194..f7cc81367 100644 --- a/source/glest_game/menu/menu_state_options_graphics.cpp +++ b/source/glest_game/menu/menu_state_options_graphics.cpp @@ -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")); } diff --git a/source/glest_game/menu/menu_state_options_network.cpp b/source/glest_game/menu/menu_state_options_network.cpp index 0cf6914e4..3542a4b37 100644 --- a/source/glest_game/menu/menu_state_options_network.cpp +++ b/source/glest_game/menu/menu_state_options_network.cpp @@ -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")); }