[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.61,1.61.2.1

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Wed Sep 8 02:26:11 CEST 2004


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12225

Modified Files:
      Tag: branch-0-6-0
	midi.cpp 
Log Message:
Fingolfin's suggested fix for bug #1004919.


Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.61
retrieving revision 1.61.2.1
diff -u -d -r1.61 -r1.61.2.1
--- midi.cpp	6 Jan 2004 12:45:31 -0000	1.61
+++ midi.cpp	8 Sep 2004 09:24:47 -0000	1.61.2.1
@@ -398,9 +398,12 @@
 		// 1 BYTE : Always seems to be 0x00
 		// 1 BYTE : Ranges from 0x02 to 0x08 (always 0x02 for SFX, though)
 		// 1 BYTE : Loop control. 0 = no loop, 1 = loop
-		if (!sfx)
-			setLoop(p->data[6] != 0);
-
+		if (!sfx) {
+			// According to bug #1004919 calling setLoop() from
+			// within a lock causes a lockup, though I have no
+			// idea when this actually happens.
+			_loopTrack = (p->data[6] != 0);
+		}
 	}
 
 	MidiParser *parser = MidiParser::createParser_SMF();





More information about the Scummvm-git-logs mailing list