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

[Kirben at users.sourceforge.net]

Revision: 53561
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53561&view=rev
Author:   Kirben
Date:     2010-10-18 04:23:30 +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 00:43:49 UTC (rev 53560)
+++ scummvm/trunk/engines/scumm/he/sound_he.cpp	2010-10-18 04:23:30 UTC (rev 53561)
@@ -241,7 +241,7 @@
 			chan = i;
 	}
 
-	if (_mixer->isSoundHandleActive(_heSoundChannels[chan]) && chan != -1) {
+	if (chan != -1 && _mixer->isSoundHandleActive(_heSoundChannels[chan])) {
 		return _heChannel[chan].sbngBlock;
 	} else {
 		return 0;
@@ -255,7 +255,7 @@
 			chan = i;
 	}
 
-	if (_mixer->isSoundHandleActive(_heSoundChannels[chan]) && chan != -1) {
+	if (chan != -1 && _mixer->isSoundHandleActive(_heSoundChannels[chan])) {
 		int time =  _vm->getHETimer(chan + 4) * _heChannel[chan].rate / 1000;
 		return time;
 	} else {


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