monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix 19fe8ae3ef

Browse source 
Don't prompt for restore-height on generate-new-wallet
This commit is contained in:
Howard Chu 2016-04-29 04:51:02 +01:00
parent bdb93cbf3d
commit 2fb00c0666
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/simplewallet/simplewallet.cpp
View file

@ -1157,7 +1157,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
return false; return false;
} }
} }
if (!m_restore_height) if (!m_restore_height && m_generate_new.empty())
{ {
std::string heightstr = command_line::input_line("Restore from specific blockchain height (optional, default 0): "); std::string heightstr = command_line::input_line("Restore from specific blockchain height (optional, default 0): ");
if (std::cin.eof()) if (std::cin.eof())
@ -1449,7 +1449,7 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
m_wallet->init(m_daemon_address); m_wallet->init(m_daemon_address);
// for a totally new account, we don't care about older blocks. // for a totally new account, we don't care about older blocks.
if (!m_restore_deterministic_wallet) if (!m_generate_new.empty())
{ {
std::string err; std::string err;
m_wallet->set_refresh_from_block_height(get_daemon_blockchain_height(err)); m_wallet->set_refresh_from_block_height(get_daemon_blockchain_height(err));