diff options
| author | fireice-uk <fireice-uk@users.noreply.github.com> | 2017-12-07 21:57:41 +0000 |
|---|---|---|
| committer | fireice-uk <fireice-uk@users.noreply.github.com> | 2017-12-08 11:36:02 +0000 |
| commit | 78761c5454fe90d66d91e77427b30e57939da7a7 (patch) | |
| tree | ed4d1afb33c0c011a214d8d924d6e39b867c81d7 /xmrstak | |
| parent | 065f420f8939321a35754d033e68be72b2f9c8e2 (diff) | |
| download | xmr-stak-78761c5454fe90d66d91e77427b30e57939da7a7.zip xmr-stak-78761c5454fe90d66d91e77427b30e57939da7a7.tar.gz | |
Fix option order
Diffstat (limited to 'xmrstak')
| -rw-r--r-- | xmrstak/cli/cli-miner.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index 2c44ffc..6da0855 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -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(); |
