[Scummvm-cvs-logs] SF.net SVN: scummvm:[33284] scummvm/branches/branch-0-12-0/engines/agos/ agos.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Fri Jul 25 11:37:47 CEST 2008


Revision: 33284
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33284&view=rev
Author:   dreammaster
Date:     2008-07-25 09:37:47 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
Backport of fix to prevent attempt to delete a non-initialised object during game exit

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/agos/agos.cpp

Modified: scummvm/branches/branch-0-12-0/engines/agos/agos.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/agos/agos.cpp	2008-07-25 09:36:18 UTC (rev 33283)
+++ scummvm/branches/branch-0-12-0/engines/agos/agos.cpp	2008-07-25 09:37:47 UTC (rev 33284)
@@ -578,6 +578,8 @@
 
 
 		_midiEnabled = true;
+	} else {
+		_driver = NULL;
 	}
 
 	// allocate buffers
@@ -881,7 +883,8 @@
 		delete _gameFile;
 
 	_midi.close();
-	delete _driver;
+	if (_driver)
+		delete _driver;
 
 	AudioCD.destroy();
 


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