[Scummvm-cvs-logs] CVS: scummvm/gui options.cpp,1.25,1.26

Max Horn fingolfin at users.sourceforge.net
Fri Oct 17 17:23:34 CEST 2003


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv12549/gui

Modified Files:
	options.cpp 
Log Message:
We proudly present the latest installment of our hit series 'Untangle the mess': 'Help! Space Invaders refactored the music detector'... in other news, I obviously need to sleep now

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- options.cpp	8 Oct 2003 21:59:22 -0000	1.25
+++ options.cpp	18 Oct 2003 00:22:46 -0000	1.26
@@ -92,9 +92,10 @@
 	
 	// Populate it
 	const MidiDriverDescription *md = getAvailableMidiDrivers();
+	const int midiDriver = parseMusicDriver(ConfMan.get("music_driver"));
 	while (md->name) {
 		_midiPopUp->appendEntry(md->description, md->id);
-		if (md->id == detector._midi_driver)
+		if (md->id == midiDriver)
 			midiSelected = i;
 		i++;
 		md++;





More information about the Scummvm-git-logs mailing list