github-jwinterm/xmr-stak
1
0
Fork 0
mirror of https://github.com/jwinterm/xmr-stak.git synced 2026-10-17 05:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix option order

Browse Source
This commit is contained in:
fireice-uk
2017-12-08 11:36:02 +00:00
parent 065f420f89
commit 78761c5454
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmrstak/cli/cli-miner.cpp
+11 -3
View File
@@ -376,7 +376,15 @@ int main(int argc, char *argv[])
}
bool uacDialog = true;
for(int i = 1; i < argc; ++i)
bool pool_url_set = false;
for(size_t i = 1; i < argc-1; i++)
{
std::string opName(argv[i]);
if(opName == "-o" || opName == "-O" || opName == "--url" || opName == "--tls-url")
pool_url_set = true;
}
for(size_t i = 1; i < argc; ++i)
{
std::string opName(argv[i]);
if(opName.compare("-h") == 0 || opName.compare("--help") == 0)
@@ -479,7 +487,7 @@ int main(int argc, char *argv[])
}
else if(opName.compare("-u") == 0 || opName.compare("--user") == 0)
{
if(params::inst().poolURL.empty())
if(!pool_url_set)
{
printer::inst()->print_msg(L0, "Pool address has to be set if you want to specify username and password.");
win_exit();
@@ -497,7 +505,7 @@ int main(int argc, char *argv[])
}
else if(opName.compare("-p") == 0 || opName.compare("--pass") == 0)
{
if(params::inst().poolURL.empty())
if(!pool_url_set)
{
printer::inst()->print_msg(L0, "Pool address has to be set if you want to specify username and password.");
win_exit();