diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-10-15 17:21:12 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-10-15 17:21:12 +0200 |
commit | f7b9f44c1b0d53170fd7f53d37fc67648f3247a2 (patch) | |
tree | afc13a3ee6a049ec78ac234e2d55ff46e992b457 /src/cryptonote_basic/miner.cpp | |
parent | Merge pull request #2548 (diff) | |
parent | Subaddresses (diff) | |
download | monero-f7b9f44c1b0d53170fd7f53d37fc67648f3247a2.tar.xz |
Merge pull request #2056
53ad5a0f Subaddresses (kenshi84)
Diffstat (limited to '')
-rw-r--r-- | src/cryptonote_basic/miner.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp index b620e3426..8f53c2d3c 100644 --- a/src/cryptonote_basic/miner.cpp +++ b/src/cryptonote_basic/miner.cpp @@ -228,11 +228,13 @@ namespace cryptonote if(command_line::has_arg(vm, arg_start_mining)) { - if(!cryptonote::get_account_address_from_str(m_mine_address, testnet, command_line::get_arg(vm, arg_start_mining))) + address_parse_info info; + if(!cryptonote::get_account_address_from_str(info, testnet, command_line::get_arg(vm, arg_start_mining)) || info.is_subaddress) { LOG_ERROR("Target account address " << command_line::get_arg(vm, arg_start_mining) << " has wrong format, starting daemon canceled"); return false; } + m_mine_address = info.address; m_threads_total = 1; m_do_mining = true; if(command_line::has_arg(vm, arg_mining_threads)) |