[Scummvm-cvs-logs] SF.net SVN: scummvm:[52824] scummvm/branches/branch-1-2-0/engines/sword2/ sword2.cpp

sev at users.sourceforge.net sev at users.sourceforge.net
Mon Sep 20 22:24:08 CEST 2010


Revision: 52824
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52824&view=rev
Author:   sev
Date:     2010-09-20 20:24:08 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
SWORD2: Backport fix for bug #3032763

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/sword2/sword2.cpp

Modified: scummvm/branches/branch-1-2-0/engines/sword2/sword2.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/sword2/sword2.cpp	2010-09-20 20:18:35 UTC (rev 52823)
+++ scummvm/branches/branch-1-2-0/engines/sword2/sword2.cpp	2010-09-20 20:24:08 UTC (rev 52824)
@@ -334,10 +334,14 @@
 	// 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"));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list