[Scummvm-cvs-logs] SF.net SVN: scummvm: [27823] scummvm/branches/branch-0-10-0
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sun Jul 1 15:12:53 CEST 2007
Revision: 27823
http://scummvm.svn.sourceforge.net/scummvm/?rev=27823&view=rev
Author: eriktorbjorn
Date: 2007-07-01 06:12:52 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
Backported fix for Simon 2 crash on exit. (Also fixes an unrelated delete vs
delete[] Valgrind warning.)
Modified Paths:
--------------
scummvm/branches/branch-0-10-0/NEWS
scummvm/branches/branch-0-10-0/engines/agos/agos.cpp
Modified: scummvm/branches/branch-0-10-0/NEWS
===================================================================
--- scummvm/branches/branch-0-10-0/NEWS 2007-07-01 13:01:15 UTC (rev 27822)
+++ scummvm/branches/branch-0-10-0/NEWS 2007-07-01 13:12:52 UTC (rev 27823)
@@ -8,6 +8,7 @@
AGOS:
- Fixed crashes related to OmniTV playback in The Feeble Files.
+ - Fixed crash on exit in Simon the Sorcerer 2.
BASS:
- Better MT-32 compatibility
Modified: scummvm/branches/branch-0-10-0/engines/agos/agos.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agos/agos.cpp 2007-07-01 13:01:15 UTC (rev 27822)
+++ scummvm/branches/branch-0-10-0/engines/agos/agos.cpp 2007-07-01 13:12:52 UTC (rev 27823)
@@ -920,7 +920,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();
@@ -950,7 +952,7 @@
delete _dummyItem2;
delete _dummyItem3;
- delete [] _dummyWindow;
+ delete _dummyWindow;
delete [] _windowList;
delete _debugger;
@@ -1053,7 +1055,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();
@@ -1083,7 +1087,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