[Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.33,1.34

James Brown ender at users.sourceforge.net
Thu May 9 11:04:01 CEST 2002


Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv6699/sound

Modified Files:
	imuse.cpp 
Log Message:
Fix odd Sam and Max iMUSE crash. Thread syncronisation bug?



Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- imuse.cpp	7 May 2002 21:42:51 -0000	1.33
+++ imuse.cpp	9 May 2002 18:03:07 -0000	1.34
@@ -4411,6 +4411,13 @@
 	if (!(mc = part->_mc->gm()))
 		return;
 
+	if (part->_player == NULL) {	/* No player, so dump phantom channel */
+		part->_mc = NULL;
+		mc->_part = NULL;
+		memset(mc->_actives, 0, sizeof(mc->_actives));
+		return;
+	}
+
 	if (what & pcMod)
 		midiPitchBend(mc->_chan,
 									clamp(part->_pitchbend + part->_detune_eff +





More information about the Scummvm-git-logs mailing list