From ada933c2ad25bce6200d0edfb0df73ecca17b764 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 18 Oct 2010 04:25:53 +0000
Subject: SCUMM: Check the sound channel is valid, before checking the sound
 channel.

svn-id: r53562
---
 engines/scumm/he/sound_he.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index f059ee7d5e..318cb818b6 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -276,7 +276,7 @@ int SoundHE::getSoundVar(int sound, int var) {
 			chan = i;
 	}
 
-	if (_mixer->isSoundHandleActive(_heSoundChannels[chan]) && chan != -1) {
+	if (chan != -1 && _mixer->isSoundHandleActive(_heSoundChannels[chan])) {
 		debug(5, "getSoundVar: sound %d var %d result %d", sound, var, _heChannel[chan].soundVars[var]);
 		return _heChannel[chan].soundVars[var];
 	} else {
-- 
cgit v1.2.3