diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:51:52 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:51:52 +0200 |
| commit | fbfdaae06f0c9660fa889a3edcb21faca753f78d (patch) | |
| tree | e8e806b2559a579103fc6cc5e59d5b2f6a084e43 | |
| parent | Merge pull request #2806 (diff) | |
| parent | daemon & simplewallet: don't set max-concurrency when unspecified (diff) | |
| download | monero-fbfdaae06f0c9660fa889a3edcb21faca753f78d.tar.xz | |
Merge pull request #2807
61712384 daemon & simplewallet: don't set max-concurrency when unspecified (stoffu)
| -rw-r--r-- | src/daemon/main.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet_args.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index ae83943b6..d038cc825 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -278,7 +278,7 @@ int main(int argc, char const * argv[]) tools::set_stack_trace_log(log_file_path.filename().string()); #endif // STACK_TRACE - if (command_line::has_arg(vm, daemon_args::arg_max_concurrency)) + if (!command_line::is_arg_defaulted(vm, daemon_args::arg_max_concurrency)) tools::set_max_concurrency(command_line::get_arg(vm, daemon_args::arg_max_concurrency)); // logging is now set up diff --git a/src/wallet/wallet_args.cpp b/src/wallet/wallet_args.cpp index cc6bb1de2..e665042d4 100644 --- a/src/wallet/wallet_args.cpp +++ b/src/wallet/wallet_args.cpp @@ -178,7 +178,7 @@ namespace wallet_args mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str()); } - if(command_line::has_arg(vm, arg_max_concurrency)) + if (!command_line::is_arg_defaulted(vm, arg_max_concurrency)) tools::set_max_concurrency(command_line::get_arg(vm, arg_max_concurrency)); Print(print) << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")"; |