[Scummvm-cvs-logs] CVS: scummvm/queen music.cpp,1.25.2.1,1.25.2.2

Joost Peters joostp at users.sourceforge.net
Tue Dec 21 05:28:03 CET 2004


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

Modified Files:
      Tag: branch-0-7-0
	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.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- music.cpp	20 Dec 2004 12:49:16 -0000	1.25.2.1
+++ music.cpp	21 Dec 2004 13:27:43 -0000	1.25.2.2
@@ -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;





More information about the Scummvm-git-logs mailing list