Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megagl…

…est-source into develop
MegaGlest · Jan 7, 2016 · 1767838 · 1767838
2 parents 9496f48 + b36c6cd
commit 1767838
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 24 deletions.
diff --git 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
@@ -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"));
 }