[Scummvm-cvs-logs] scummvm master -> 94c7e37ac38d991e96f2336e0a09e748fcbd1080

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
94c7e37ac3 QUEEN: Delete the parser before closing the driver.


Commit: 94c7e37ac38d991e96f2336e0a09e748fcbd1080
    https://github.com/scummvm/scummvm/commit/94c7e37ac38d991e96f2336e0a09e748fcbd1080
Author: eriktorbjorn (eriktorbjorn at users.sourceforge.net)
Date: 2011-05-07T13:19:59-07:00

Commit Message:
QUEEN: Delete the parser before closing the driver.

Deleting the parser may fire off a series of events, so it's
probably a good idea to keep the driver open for that. I have not
seen this error anywhere else, except maybe in the unit tests.

Changed paths:
    engines/queen/music.cpp



diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp
index 58ecfa6..5d1a06c 100644
--- a/engines/queen/music.cpp
+++ b/engines/queen/music.cpp
@@ -99,8 +99,8 @@ MidiMusic::MidiMusic(QueenEngine *vm)
 MidiMusic::~MidiMusic() {
 	_driver->setTimerCallback(0, 0);
 	_parser->unloadMusic();
-	_driver->close();
 	delete _parser;
+	_driver->close();
 	delete _driver;
 	delete[] _buf;
 	delete[] _musicData;