[Scummvm-cvs-logs] SF.net SVN: scummvm: [27617] scummvm/trunk/engines/agos/agos.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Fri Jun 22 22:20:35 CEST 2007


Revision: 27617
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27617&view=rev
Author:   eriktorbjorn
Date:     2007-06-22 13:20:34 -0700 (Fri, 22 Jun 2007)

Log Message:
-----------
Work around a crash when quitting Simon 2. If this is the proper fix, it should
almost certainly go into the 0.10 branch as well.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2007-06-22 20:04:44 UTC (rev 27616)
+++ scummvm/trunk/engines/agos/agos.cpp	2007-06-22 20:20:34 UTC (rev 27617)
@@ -914,7 +914,9 @@
 
 AGOSEngine::~AGOSEngine() {
 	// Sync with AGOSEngine::shutdown()
-	delete _gameFile;
+	// In Simon 2, this gets deleted along with _sound further down
+	if (getGameType() != GType_SIMON2)
+		delete _gameFile;
 
 	_midi.close();
 
@@ -943,7 +945,7 @@
 	delete _dummyItem2;
 	delete _dummyItem3;
 
-	delete [] _dummyWindow;
+	delete _dummyWindow;
 	delete [] _windowList;
 
 	delete _debugger;
@@ -1046,7 +1048,9 @@
 
 void AGOSEngine::shutdown() {
 	// Sync with AGOSEngine::~AGOSEngine()
-	delete _gameFile;
+	// In Simon 2, this gets deleted along with _sound further down
+	if (getGameType() != GType_SIMON2)
+		delete _gameFile;
 
 	_midi.close();
 
@@ -1075,7 +1079,7 @@
 	delete _dummyItem2;
 	delete _dummyItem3;
 
-	delete [] _dummyWindow;
+	delete _dummyWindow;
 	delete [] _windowList;
 
 	delete _debugger;


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




More information about the Scummvm-git-logs mailing list