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

Lionel Ulmer bbrox at users.sourceforge.net
Tue May 7 14:43:06 CEST 2002


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

Modified Files:
	imuse.cpp 
Log Message:
Fix a (very rare outside of running with GDB) race condition between
thread start and the parameters used by the thread.



Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- imuse.cpp	4 May 2002 00:20:39 -0000	1.32
+++ imuse.cpp	7 May 2002 21:42:51 -0000	1.33
@@ -4249,7 +4249,7 @@
 
 	for(;;) {
 		mid->_system->delay_msecs(10);
-
+		
 		cur_time = mid->_system->get_msecs();
 		while (old_time < cur_time) {
 			old_time += 10;
@@ -4318,8 +4318,8 @@
 		error("IMuseGM::error = %s", MidiDriver::get_error_name(result));
 
 	/* Install the on_timer thread */
-	syst->create_thread(midi_driver_thread, this);
 	_se = eng;
+	syst->create_thread(midi_driver_thread, this);
 
 	for (i = 0, mc = _midi_channels; i != ARRAYSIZE(_midi_channels); i++, mc++)
 		mc->_chan = i;





More information about the Scummvm-git-logs mailing list