summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2018-12-10 18:42:21 +0100
committerJonathan Bauer2018-12-10 18:42:21 +0100
commit7d6e3bdbc439aeb9bb7ed5853059d902580c815a (patch)
treeacbd8602f7c01c1f19d316b6316460535c863683
parentWTF did we have two classes for downloading files? (diff)
downloadvmchooser2-7d6e3bdbc439aeb9bb7ed5853059d902580c815a.tar.gz
vmchooser2-7d6e3bdbc439aeb9bb7ed5853059d902580c815a.tar.xz
vmchooser2-7d6e3bdbc439aeb9bb7ed5853059d902580c815a.zip
formattig: move runscript parsing
-rw-r--r--src/main.cpp14
1 files 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