From d7085acea18e9134da230e8223f529f7978fb3f9 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 21 Sep 2004 01:07:29 +0000
Subject: Switch order to prevent warning

svn-id: r15213
---
 scumm/sound.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index b79ae052e7..77c595a42e 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -773,15 +773,15 @@ int Sound::isSoundRunning(int sound) const {
 		}
 	}
 
+	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);
 
-- 
cgit v1.2.3