[Scummvm-cvs-logs] SF.net SVN: scummvm:[55093] scummvm/trunk/engines/mohawk/sound.cpp

[fuzzie at users.sourceforge.net]

Revision: 55093
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55093&view=rev
Author:   fuzzie
Date:     2011-01-02 14:23:18 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
MOHAWK: Don't delete the MIDI driver before the parser.

The parser was trying to call into the deleted driver.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/sound.cpp

Modified: scummvm/trunk/engines/mohawk/sound.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/sound.cpp	2011-01-02 14:15:15 UTC (rev 55092)
+++ scummvm/trunk/engines/mohawk/sound.cpp	2011-01-02 14:23:18 UTC (rev 55093)
@@ -45,15 +45,15 @@
 	stopSound();
 	stopAllSLST();
 
+	if (_midiParser) {
+		_midiParser->unloadMusic();
+		delete _midiParser;
+	}
+
 	if (_midiDriver) {
 		_midiDriver->close();
 		delete _midiDriver;
 	}
-
-	if (_midiParser) {
-		_midiParser->unloadMusic();
-		delete _midiParser;
-	}
 }
 
 void Sound::initMidi() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.