From 716a4c6c65251cd271ef6df97accf346087f5c40 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Thu, 27 Sep 2018 10:54:03 +0200
Subject: [PATCH] Parse command line arguments after config files
* so that command line arguments have precedence.
---
src/gui/main.cc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gui/main.cc.in b/src/gui/main.cc.in
index 2dd85cf..028451b 100644
--- a/src/gui/main.cc.in
+++ b/src/gui/main.cc.in
@@ -62,6 +62,7 @@ int main(int argc, char *argv[])
Settings settings ("@CMAKE_INSTALL_PREFIX@");
settings.setupPaths ();
+ settings.fromFiles ();
switch (settings.fromArgv (argc, argv)) {
case 0:
break;
@@ -73,7 +74,6 @@ int main(int argc, char *argv[])
qDebug () << "Settings.fromArgv returned unknow error code";
break;
}
- settings.fromFiles ();
QSplashScreen splash(pixmap);
splash.show();
--
GitLab