From c016117a951c284aabf2c3f2076d9541a922968c Mon Sep 17 00:00:00 2001 From: BenDr0id Date: Fri, 17 Aug 2018 11:38:31 +0200 Subject: [PATCH] CMD params overrule config file --- src/Options.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Options.cpp b/src/Options.cpp index d65a3a96..6a69fade 100644 --- a/src/Options.cpp +++ b/src/Options.cpp @@ -359,6 +359,8 @@ Options::Options(int argc, char **argv) : { m_pools.push_back(new Url()); + parseConfig(Platform::defaultConfigName()); + int key; while (true) { @@ -378,10 +380,6 @@ Options::Options(int argc, char **argv) : } #ifdef XMRIG_CC_SERVER - if (m_ccPort == 0) { - parseConfig(Platform::defaultConfigName()); - } - if (m_ccPort == 0) { fprintf(stderr, "No CC Server Port supplied. Exiting.\n"); return; @@ -394,10 +392,6 @@ Options::Options(int argc, char **argv) : } #endif - if (!m_pools[0]->isValid()) { - parseConfig(Platform::defaultConfigName()); - } - if (!m_pools[0]->isValid() && (!m_ccHost || m_ccPort == 0)) { fprintf(stderr, "Neither pool nor CCServer URL supplied. Exiting.\n"); return;