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

[drmccoy at users.sourceforge.net]

Revision: 31952
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31952&view=rev
Author:   drmccoy
Date:     2008-05-08 11:39:13 -0700 (Thu, 08 May 2008)

Log Message:
-----------
Reordering game parts deinitialization, to avoid having one part's destructor access an already destroyed part

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

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2008-05-08 18:11:43 UTC (rev 31951)
+++ scummvm/trunk/engines/gob/gob.cpp	2008-05-08 18:39:13 UTC (rev 31952)
@@ -382,12 +382,12 @@
 }
 
 void GobEngine::deinitGameParts() {
+	delete _saveLoad;  _saveLoad = 0;
 	delete _mult;      _mult = 0;
+	delete _vidPlayer; _vidPlayer = 0;
 	delete _game;      _game = 0;
 	delete _global;    _global = 0;
-	delete _dataIO;    _dataIO = 0;
 	delete _goblin;    _goblin = 0;
-	delete _vidPlayer; _vidPlayer = 0;
 	delete _init;      _init = 0;
 	delete _inter;     _inter = 0;
 	delete _map;       _map = 0;
@@ -397,8 +397,8 @@
 	delete _draw;      _draw = 0;
 	delete _util;      _util = 0;
 	delete _video;     _video = 0;
-	delete _saveLoad;  _saveLoad = 0;
 	delete _sound;     _sound = 0;
+	delete _dataIO;    _dataIO = 0;
 }
 
 } // End of namespace Gob


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