From 97870a220de94ded0d7f0c70a6008c4d47b424ed Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 21 Jul 2010 20:12:57 +0000
Subject: AGOS: Make the "m" hotkey respect the mute setting.

svn-id: r51102
---
 engines/agos/agos.cpp  | 2 +-
 engines/agos/input.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 5e78a5d52a..670c701198 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -1048,7 +1048,7 @@ void AGOSEngine::syncSoundSettings() {
 	if (ConfMan.hasKey("mute"))
 		mute = ConfMan.getBool("mute");
 
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (mute ? 0 : soundVolumeMusic));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (mute ? 0 : (_musicPaused ? 0 : soundVolumeMusic)));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, (mute ? 0 : soundVolumeSFX));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, (mute ? 0 : soundVolumeSpeech));
 
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 5fc2a64416..1246149aa5 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -602,7 +602,7 @@ bool AGOSEngine::processSpecialKeys() {
 		if (_midiEnabled) {
 			_midi.pause(_musicPaused);
 		}
-		_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (_musicPaused) ? 0 : ConfMan.getInt("music_volume"));
+		syncSoundSettings();
 		break;
 	case 's':
 		if (getGameId() == GID_SIMON1DOS) {
-- 
cgit v1.2.3