[Scummvm-cvs-logs] CVS: scummvm/queen music.cpp,1.26,1.27

[Joost Peters]

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

Modified Files:
	music.cpp 
Log Message:
Change order of close()'ing and delete'ing _driver and _parser; fixes bug #1088441


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/music.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- music.cpp	20 Dec 2004 12:39:54 -0000	1.26
+++ music.cpp	21 Dec 2004 13:26:50 -0000	1.27
@@ -55,10 +55,9 @@
 	}
 	
 	MusicPlayer::~MusicPlayer() {
-		_driver->setTimerCallback(NULL, NULL);
 		_parser->unloadMusic();
-		this->close();
 		delete _parser;
+		this->close();
 		delete[] _buf;
 	}
 	
@@ -124,7 +123,7 @@
 	}
 	
 	void MusicPlayer::close() {
-		stopMusic();
+		_driver->setTimerCallback(NULL, NULL);
 		if (_driver)
 			_driver->close();
 		_driver = 0;