[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_script.cpp,1.21,1.22

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Mon Jul 19 08:22:12 CEST 2004


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

Modified Files:
	dimuse_script.cpp 
Log Message:
Applied patch #993803 (fix for a COMI hang) after some discussion with
aquadran. Let's hope the cure isn't worse than the disease...


Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- dimuse_script.cpp	19 Jul 2004 10:51:00 -0000	1.21
+++ dimuse_script.cpp	19 Jul 2004 15:21:29 -0000	1.22
@@ -277,7 +277,7 @@
 		Track *track = _track[l];
 		if (track->soundId == sound) {
 			if ((track->stream2 && track->handle.isActive()) ||
-				(track->stream && track->used)) {
+				(track->stream && track->used && !track->readyToRemove)) {
 					return 1;
 			}
 		}





More information about the Scummvm-git-logs mailing list