From 7ee1a2d4955d19010cf3520b75b0769ee3b48666 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 12 Mar 2005 11:06:07 +0000
Subject: Broke HE music looping

svn-id: r17089
---
 scumm/sound.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scumm')

diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 01fdd86ac4..f665736b72 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -820,14 +820,14 @@ int Sound::isSoundRunning(int sound) const {
 			// getSoundStatus(), with a -1, will return the
 			// ID number of the first active music it finds.
 			if (_currentMusic)
-				sound = _currentMusic;
+				return (_vm->_mixer->isSoundIDActive(_currentMusic) ? _currentMusic : 0);
 			else if (_vm->_imuse)
 				return (_vm->_imuse->getSoundStatus(sound));
 		} else if (sound >= 10000) {
 			// TODO report sound ID on channel
 			// channel = sound - 10000
 			if (sound == 10000)
-				return _currentMusic;
+				return (_vm->_mixer->isSoundIDActive(_currentMusic) ? _currentMusic : 0);
 			else
 				return 0;
 		}
-- 
cgit v1.2.3