diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:19:24 +0100 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:19:24 +0100 |
| commit | 82599ef0e36e2548721ad151a3e7c68b380ef667 (patch) | |
| tree | 94e4a36ff7885e73276205eea3843319f59dc00a /src/wallet/wallet2.cpp | |
| parent | Merge pull request #3171 (diff) | |
| parent | wallet-cli: Do not ask for scan_from_height if it explicitly is set to zero. (diff) | |
| download | monero-82599ef0e36e2548721ad151a3e7c68b380ef667.tar.xz | |
Merge pull request #3175
3be98036 wallet-cli: Do not ask for scan_from_height if it explicitly is set to zero. (Maximilian Lupke)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index f83aad63d..d97e53011 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -361,6 +361,7 @@ std::unique_ptr<tools::wallet2> generate_from_json(const std::string& json_file, wallet.reset(make_basic(vm, opts, password_prompter).release()); wallet->set_refresh_from_block_height(field_scan_from_height); + wallet->explicit_refresh_from_block_height(field_scan_from_height_found); try { @@ -601,6 +602,7 @@ wallet2::wallet2(bool testnet, bool restricted): m_refresh_type(RefreshOptimizeCoinbase), m_auto_refresh(true), m_refresh_from_block_height(0), + m_explicit_refresh_from_block_height(true), m_confirm_missing_payment_id(true), m_ask_password(true), m_min_output_count(0), |