[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.33,1.34

Jamieson Christian jamieson630 at users.sourceforge.net
Tue May 20 17:41:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv27398/scummvm/simon

Modified Files:
	midi.cpp 
Log Message:
Fixed thread problem that causes occassional crashes

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- midi.cpp	20 May 2003 17:23:15 -0000	1.33
+++ midi.cpp	21 May 2003 00:40:08 -0000	1.34
@@ -104,10 +104,9 @@
 
 void MidiPlayer::onTimer (void *data) {
 	MidiPlayer *player = (MidiPlayer *) data;
-	if (player->_paused || !player->_parser)
-		return;
 	player->_system->lock_mutex (player->_mutex);
-	player->_parser->onTimer();
+	if (!player->_paused && player->_parser)
+		player->_parser->onTimer();
 	player->_system->unlock_mutex (player->_mutex);
 }
 





More information about the Scummvm-git-logs mailing list