Merge pull request #3416

6f54c910 simplewallet: fix restore height prompt that got disabled by #3175 (stoffu)
This commit is contained in:
Riccardo Spagni 2018-03-16 18:10:19 +02:00
commit a14eabc043
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -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;