aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-03-16 18:10:19 +0200
committerRiccardo Spagni <ric@spagni.net>2018-03-16 18:10:20 +0200
commita14eabc0437c01ae9245bd9ba1641d96b889306a (patch)
treeb7a80295130502cfe7954d4e2f2895b457530a69
parentMerge pull request #3414 (diff)
parentsimplewallet: fix restore height prompt that got disabled by #3175 (diff)
downloadmonero-a14eabc0437c01ae9245bd9ba1641d96b889306a.tar.xz
Merge pull request #3416
6f54c910 simplewallet: fix restore height prompt that got disabled by #3175 (stoffu)
-rw-r--r--src/simplewallet/simplewallet.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 6ac8fee9d..747c91d16 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -2920,6 +2920,11 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
r = new_wallet(vm, m_recovery_key, m_restore_deterministic_wallet, m_non_deterministic, old_language);
CHECK_AND_ASSERT_MES(r, false, tr("account creation failed"));
}
+
+ if (m_restoring && m_generate_from_json.empty())
+ {
+ m_wallet->explicit_refresh_from_block_height(!command_line::is_arg_defaulted(vm, arg_restore_height));
+ }
if (!m_wallet->explicit_refresh_from_block_height() && m_restoring)
{
uint32_t version;