Merge pull request #3175

3be98036 wallet-cli: Do not ask for scan_from_height if it explicitly is set to zero. (Maximilian Lupke)
This commit is contained in:
Riccardo Spagni 2018-02-16 14:19:24 +01:00
commit 82599ef0e3
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 9 additions and 1 deletions

View file

@ -2474,7 +2474,7 @@ 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_restore_height && m_restoring)
if (!m_wallet->explicit_refresh_from_block_height() && m_restoring)
{
uint32_t version;
bool connected = try_connect_to_daemon(false, &version);