[Scummvm-cvs-logs] SF.net SVN: scummvm:[53562] scummvm/trunk/engines/scumm/he/sound_he.cpp

[Kirben at users.sourceforge.net]

Revision: 53562
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53562&view=rev
Author:   Kirben
Date:     2010-10-18 04:25:53 +0000 (Mon, 18 Oct 2010)

Log Message:
-----------
SCUMM: Check the sound channel is valid, before checking the sound channel.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/sound_he.cpp

Modified: scummvm/trunk/engines/scumm/he/sound_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/sound_he.cpp	2010-10-18 04:23:30 UTC (rev 53561)
+++ scummvm/trunk/engines/scumm/he/sound_he.cpp	2010-10-18 04:25:53 UTC (rev 53562)
@@ -276,7 +276,7 @@
 			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 {


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