[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.23,1.24

[Jonathan Gray]

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

Modified Files:
	mididrv.cpp 
Log Message:
patch 638246 Fix for ALSA and SEQ MIDI drivers with simon, by jamieson

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mididrv.cpp	13 Nov 2002 01:03:24 -0000	1.23
+++ mididrv.cpp	16 Nov 2002 01:16:53 -0000	1.24
@@ -544,10 +544,11 @@
 	if (_mode != 0)
 		return MERR_ALREADY_OPEN;
 	device = 0;
-	_mode = mode;
 	if (mode != MO_SIMPLE)
 		return MERR_STREAMING_NOT_AVAILABLE;
 
+	_mode = mode;
+
 	char *device_name = getenv("SCUMMVM_MIDI");
 	if (device_name != NULL) {
 		device = (::open((device_name), O_RDWR, 0));
@@ -1114,10 +1115,11 @@
 
 	if (_mode != 0)
 		return MERR_ALREADY_OPEN;
-	_mode = mode;
 
 	if (mode != MO_SIMPLE)
 		return MERR_STREAMING_NOT_AVAILABLE;
+
+	_mode = mode;
 
 	if (!(var = getenv("SCUMMVM_PORT"))) {
 		// default alsa port if none specified