From ac178b6013f3a1b090cfca1d8e9e2ad6429f4e77 Mon Sep 17 00:00:00 2001
From: uruk
Date: Fri, 25 Jul 2014 22:43:20 +0200
Subject: CGE2: Fix optionTouch().

Now you can't change the sound options via the toolbar if the Mute All option is checked in the GGM/Launcher.
---
 engines/cge2/toolbar.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/cge2/toolbar.cpp b/engines/cge2/toolbar.cpp
index d8687e3944..2242cc41ff 100644
--- a/engines/cge2/toolbar.cpp
+++ b/engines/cge2/toolbar.cpp
@@ -73,11 +73,11 @@ void CGE2Engine::optionTouch(int opt, uint16 mask) {
 			quit();
 		break;
 	case 4:
-		if (mask & (kMouseLeftUp | kMouseRightUp))
+		if ((mask & (kMouseLeftUp | kMouseRightUp)) && !ConfMan.getBool("mute"))
 			setVolume(opt - 4, (mask & kMouseLeftUp) ? 1 : -1);
 		break;
 	case 5:
-		if (mask & (kMouseLeftUp | kMouseRightUp))
+		if ((mask & (kMouseLeftUp | kMouseRightUp)) && !ConfMan.getBool("mute"))
 			setVolume(opt - 4, (mask & kMouseLeftUp) ? 1 : -1);
 		break;
 	case 8:
-- 
cgit v1.2.3