From 7d6e3bdbc439aeb9bb7ed5853059d902580c815a Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 10 Dec 2018 18:42:21 +0100 Subject: formattig: move runscript parsing --- src/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 044f477..c3ca684 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -142,6 +142,13 @@ int main(int argc, char *argv[]) { g_xSessionPath = settings.value("xpath").toString(); } // else keep default path + // Change the runVmScript path + if (cmdOptions.contains("runscript")) { + g_runVmScript = cmdOptions.value("runscript"); + } else if (settings.contains("runscript")) { + g_runVmScript = settings.value("runscript").toString(); + } + if (cmdOptions.contains("url")) { g_urlBase = cmdOptions.value("url"); } else if (settings.contains("url")) { @@ -153,13 +160,6 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - // Change the runVmScript path - if (cmdOptions.contains("runscript")) { - g_runVmScript = cmdOptions.value("runscript"); - } else if (settings.contains("runscript")) { - g_runVmScript = settings.value("runscript").toString(); - } - /* PARSE URL */ if (!g_urlBase.startsWith("http://")) { std::cerr -- cgit v1.2.3-55-g7522