[Scummvm-cvs-logs] SF.net SVN: scummvm: [21535] scummvm/trunk/base

[fingolfin at users.sourceforge.net]

Revision: 21535
Author:   fingolfin
Date:     2006-04-01 13:52:33 -0800 (Sat, 01 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21535&view=rev

Log Message:
-----------
Moved File::resetDefaultDirectories from Engine destructor to runGame (since that is the main spot where we call addDefaultDirectory)

Modified Paths:
--------------
    scummvm/trunk/base/engine.cpp
    scummvm/trunk/base/main.cpp
Modified: scummvm/trunk/base/engine.cpp
===================================================================
--- scummvm/trunk/base/engine.cpp	2006-04-01 21:43:49 UTC (rev 21534)
+++ scummvm/trunk/base/engine.cpp	2006-04-01 21:52:33 UTC (rev 21535)
@@ -49,8 +49,6 @@
 }
 
 Engine::~Engine() {
-	Common::File::resetDefaultDirectories();
-
 	delete _mixer;
 	delete _saveFileMan;
 

Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-04-01 21:43:49 UTC (rev 21534)
+++ scummvm/trunk/base/main.cpp	2006-04-01 21:52:33 UTC (rev 21535)
@@ -336,6 +336,9 @@
 	// Stop all sound processing now (this prevents some race conditions later on)
 	system.clearSoundCallback();
 
+	// Reset the file/directory mappings
+	Common::File::resetDefaultDirectories();
+
 	return result;
 }
 


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