[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.544,2.545

Pawel Kolodziejski aquadran at users.sourceforge.net
Wed Jan 14 08:01:03 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv29428

Modified Files:
	scummvm.cpp 
Log Message:
fixed crash on exit when using imuse digital

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.544
retrieving revision 2.545
diff -u -d -r2.544 -r2.545
--- scummvm.cpp	14 Jan 2004 10:40:54 -0000	2.544
+++ scummvm.cpp	14 Jan 2004 16:00:24 -0000	2.545
@@ -851,6 +851,11 @@
 }
 
 ScummEngine::~ScummEngine() {
+	if (_musicEngine) {
+		_musicEngine->terminate();
+		delete _musicEngine;
+	}
+
 	_mixer->stopAll();
 
 	delete [] _actors;
@@ -862,10 +867,6 @@
 	delete _mainMenuDialog;
 
 	delete _sound;
-	if (_musicEngine) {
-		_musicEngine->terminate();
-		delete _musicEngine;
-	}
 	free(_languageBuffer);
 	free(_audioNames);
 





More information about the Scummvm-git-logs mailing list