[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.394,1.395

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26978/scumm

Modified Files:
	sound.cpp 
Log Message:

Switch order to prevent warning


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -d -r1.394 -r1.395
--- sound.cpp	21 Sep 2004 01:04:09 -0000	1.394
+++ sound.cpp	21 Sep 2004 01:07:29 -0000	1.395
@@ -773,15 +773,15 @@
 		}
 	}
 
+	if (_vm->_mixer->isSoundIDActive(sound))
+		return 1;
+
 	if (isSoundInQueue(sound))
 		return 1;
 
 	if (!_vm->isResourceLoaded(rtSound, sound))
 		return 0;
 
-	if (_vm->_mixer->isSoundIDActive(sound))
-		return 1;
-
 	if (_vm->_musicEngine)
 		return _vm->_musicEngine->getSoundStatus(sound);