diff options
| author | Eugene Sandulenko | 2010-09-20 20:18:35 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-09-20 20:18:35 +0000 |
| commit | 723a94099e062408ec9b58d5133f74f37e0988d3 (patch) | |
| tree | 0ba6f32536850b7cafca11e0d3c7b439b85c0dbc | |
| parent | f556a4d852e5c151d416d25708f712420ce4a28a (diff) | |
| download | scummvm-rg350-723a94099e062408ec9b58d5133f74f37e0988d3.tar.gz scummvm-rg350-723a94099e062408ec9b58d5133f74f37e0988d3.tar.bz2 scummvm-rg350-723a94099e062408ec9b58d5133f74f37e0988d3.zip | |
SWORD25: Fix bug #3032763: "SWORD2: Mute setting does not work"
svn-id: r52823
| -rw-r--r-- | engines/sword2/sword2.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 3cdab2bd2b..58958c509a 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -334,10 +334,14 @@ void Sword2Engine::syncSoundSettings() { // Our own settings dialog can mute the music, speech and sound effects // individually. ScummVM's settings dialog has one master mute setting. - if (ConfMan.getBool("mute")) { - ConfMan.setBool("music_mute", true); - ConfMan.setBool("speech_mute", true); - ConfMan.setBool("sfx_mute", true); + if (ConfMan.hasKey("mute")) { + ConfMan.setBool("music_mute", ConfMan.getBool("mute")); + ConfMan.setBool("speech_mute", ConfMan.getBool("mute")); + ConfMan.setBool("sfx_mute", ConfMan.getBool("mute")); + + if (!ConfMan.getBool("mute")) // it is false + // So remove it in order to let individual volumes work + ConfMan.removeKey("mute", ConfMan.getActiveDomainName()); } _sound->muteMusic(ConfMan.getBool("music_mute")); |