aboutsummaryrefslogtreecommitdiff
path: root/src/simplewallet
diff options
context:
space:
mode:
authormikezackles <mikezackles@gmail.com>2014-07-17 19:23:49 -0400
committermikezackles <mikezackles@gmail.com>2014-07-17 19:23:49 -0400
commit905b67bc790a09940bc22a4f199516b2b0157cdd (patch)
treed616ea77f177a5e412022b74122acf62320e5a03 /src/simplewallet
parentMerge pull request #56 from tewinget/master (diff)
parentFix thread count argument handling in simplewallet (diff)
downloadmonero-905b67bc790a09940bc22a4f199516b2b0157cdd.tar.xz
Merge pull request #63 from mikezackles/bytecoin_for_merge
Misc fixes from bytecoin
Diffstat (limited to 'src/simplewallet')
-rw-r--r--src/simplewallet/simplewallet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 8ceb583be..cbd682e78 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -499,9 +499,9 @@ bool simple_wallet::start_mining(const std::vector<std::string>& args)
}
else if (1 == args.size())
{
- uint16_t num;
+ uint16_t num = 1;
ok = string_tools::get_xtype_from_string(num, args[0]);
- ok &= (1 <= num && num <= max_mining_threads_count);
+ ok = ok && (1 <= num && num <= max_mining_threads_count);
req.threads_count = num;
}
else