fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMD params overrule config file

Browse source
This commit is contained in:
BenDr0id 2018-08-17 11:38:31 +02:00
parent 919be455a1
commit c016117a95
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Options.cpp
View file

@ -359,6 +359,8 @@ Options::Options(int argc, char **argv) :
{ {
m_pools.push_back(new Url()); m_pools.push_back(new Url());
parseConfig(Platform::defaultConfigName());
int key; int key;
while (true) { while (true) {
@ -378,10 +380,6 @@ Options::Options(int argc, char **argv) :
} }
#ifdef XMRIG_CC_SERVER #ifdef XMRIG_CC_SERVER
if (m_ccPort == 0) {
parseConfig(Platform::defaultConfigName());
}
if (m_ccPort == 0) { if (m_ccPort == 0) {
fprintf(stderr, "No CC Server Port supplied. Exiting.\n"); fprintf(stderr, "No CC Server Port supplied. Exiting.\n");
return; return;
@ -394,10 +392,6 @@ Options::Options(int argc, char **argv) :
} }
#endif #endif
if (!m_pools[0]->isValid()) {
parseConfig(Platform::defaultConfigName());
}
if (!m_pools[0]->isValid() && (!m_ccHost || m_ccPort == 0)) { if (!m_pools[0]->isValid() && (!m_ccHost || m_ccPort == 0)) {
fprintf(stderr, "Neither pool nor CCServer URL supplied. Exiting.\n"); fprintf(stderr, "Neither pool nor CCServer URL supplied. Exiting.\n");
return; return;