aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2006-05-05 00:00:39 +0000
committerMax Horn2006-05-05 00:00:39 +0000
commit5e2d023aa83fe66347b921f1ef2cc769f432c8d0 (patch)
tree0402ea5e8e14404e137e73712eefb3d047ca1575 /base
parente20d896a72be2b222672f7fe397aeca0e27cca05 (diff)
downloadscummvm-rg350-5e2d023aa83fe66347b921f1ef2cc769f432c8d0.tar.gz
scummvm-rg350-5e2d023aa83fe66347b921f1ef2cc769f432c8d0.tar.bz2
scummvm-rg350-5e2d023aa83fe66347b921f1ef2cc769f432c8d0.zip
Moved PalmOS specific call to ArgsFree up to the last point where argv is used (hopefully that's correct :-)
svn-id: r22351
Diffstat (limited to 'base')
-rw-r--r--base/main.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 2137650736..f9ec3449ea 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -287,6 +287,9 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
// 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 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
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();