[Scummvm-cvs-logs] SF.net SVN: scummvm: [22351] scummvm/trunk/base/main.cpp

[fingolfin at users.sourceforge.net]

Revision: 22351
Author:   fingolfin
Date:     2006-05-04 17:00:39 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22351&view=rev

Log Message:
-----------
Moved PalmOS specific call to ArgsFree up to the last point where argv is used (hopefully that's correct :-)

Modified Paths:
--------------
    scummvm/trunk/base/main.cpp
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp	2006-05-04 23:59:12 UTC (rev 22350)
+++ scummvm/trunk/base/main.cpp	2006-05-05 00:00:39 UTC (rev 22351)
@@ -287,6 +287,9 @@
 	// Parse the command line
 	Common::StringMap settings;
 	command = Base::parseCommandLine(settings, argc, argv);
+#ifdef PALMOS_68K
+	ArgsFree(argv);
+#endif
 
 	// Load the config file (possibly overriden via command line):
 	if (settings.contains("config")) {
@@ -325,10 +328,6 @@
 	GUI::Actions::init();
 #endif
 
-#ifdef PALMOS_68K
-	ArgsFree(argv);
-#endif
-
 	// Init the backend. Must take place after all config data (including
 	// the command line params) was read.
 	system.initBackend();


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