aboutsummaryrefslogtreecommitdiff
path: root/src/simplewallet
diff options
context:
space:
mode:
authorHoward Chu <hyc@symas.com>2016-04-29 04:51:02 +0100
committerHoward Chu <hyc@symas.com>2016-04-29 04:51:02 +0100
commit2fb00c06669bff2d4e7460d20c3239c9022ed411 (patch)
treecd27680271dfca28c9671f4158a51fb583eb9dfb /src/simplewallet
parentMerge pull request #823 (diff)
downloadmonero-2fb00c06669bff2d4e7460d20c3239c9022ed411.tar.xz
Fix 19fe8ae3ef1aa46ae8fdd4e4d6862510390ddab7
Don't prompt for restore-height on generate-new-wallet
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 8c6b8f689..8a493202f 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -1157,7 +1157,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
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): ");
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);
// 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;
m_wallet->set_refresh_from_block_height(get_daemon_blockchain_height(err));