[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.67,2.68

Jamieson Christian jamieson630 at users.sourceforge.net
Wed Jun 18 15:47:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv20238/scummvm/scumm

Modified Files:
	imuse.cpp 
Log Message:
Fix for bug [756555] ALL: With '-ewindows' notes don't stop at quit
and bug [755176] SIMON2: Hanging notes

More cleanup of the thread issues associated with iMuse and MidiParser
shutdown. Untested.

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.67
retrieving revision 2.68
diff -u -d -r2.67 -r2.68
--- imuse.cpp	17 Jun 2003 08:50:15 -0000	2.67
+++ imuse.cpp	18 Jun 2003 22:46:17 -0000	2.68
@@ -594,12 +594,7 @@
 }
 
 int IMuseInternal::terminate() {
-	// We are going to remove the MIDI drivers,
-	// so first pull any reference to them by
-	// the parts.
-	int i;
-	for (i = 0; i < ARRAYSIZE(_parts); ++i)
-		_parts[i]._mc = 0;
+	stop_all_sounds();
 
 	if (_midi_adlib) {
 		_midi_adlib->close();





More information about the Scummvm-git-logs mailing list