From 8ec2d92953e3d72664bb9bf545bddaf0c0d851a1 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sat, 8 Dec 2018 13:34:21 +0100
Subject: Fix options not getting overwritten by command line

---
 src/main.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index e718722..d9e1c6a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -64,13 +64,7 @@ int main(int argc, char **argv)
     }
 
     // create and load configuration
-    std::unique_ptr<Configuration> config = std::make_unique<Configuration>(nullptr);
-    if(!config->parse(cmd->value<std::string>("config").value())) {
-        qWarning("Error parsing config file.");
-    }
-    if(!config->parse(argc, argv)) {
-        qWarning("Error parsing command line.");
-    }
+    std::unique_ptr<Configuration> config = std::make_unique<Configuration>(argc, argv, cmd->value<std::string>("config").value());
 
     QVector<QPluginLoader *> plugins;
     CommandHash_t pluginCommands;
-- 
cgit v1.2.1