aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-08-17 15:27:21 -0500
committerluigi1111 <luigi1111w@gmail.com>2019-08-17 15:27:21 -0500
commit459beb50d4ac96c408c7b8c45bea88f7ee3e1158 (patch)
tree2b6b0bfb58c498b2663b2a6ec019c7c6df4a3197
parentMerge pull request #5518 (diff)
parentsimplewallet: don't ask about mining when running a command line (diff)
downloadmonero-459beb50d4ac96c408c7b8c45bea88f7ee3e1158.tar.xz
Merge pull request #5685
a604241 simplewallet: don't ask about mining when running a command line (moneromooo-monero)
-rw-r--r--src/simplewallet/simplewallet.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 10901bb51..9bae6c028 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -4089,7 +4089,9 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
m_wallet->callback(this);
- check_background_mining(password);
+ bool skip_check_backround_mining = !command_line::get_arg(vm, arg_command).empty();
+ if (!skip_check_backround_mining)
+ check_background_mining(password);
if (welcome)
message_writer(console_color_yellow, true) << tr("If you are new to Monero, type \"welcome\" for a brief overview.");