diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-02-28 19:48:41 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-02-28 19:48:41 -0800 |
| commit | a6cf4b09e7785d020e3ffef023dfa8dc55605d09 (patch) | |
| tree | 66a866e0ddff4236c35417bfc501807a3a213cd2 /src/wallet/wallet2.cpp | |
| parent | Merge pull request #6225 (diff) | |
| parent | wallet2: fix hang in wallet refresh (diff) | |
| download | monero-a6cf4b09e7785d020e3ffef023dfa8dc55605d09.tar.xz | |
Merge pull request #6235
5cbb17b9 wallet2: fix hang in wallet refresh (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6a622d953..d3349d58b 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3140,6 +3140,7 @@ void wallet2::fast_refresh(uint64_t stop_height, uint64_t &blocks_start_height, MERROR("Blocks start before blockchain offset: " << blocks_start_height << " " << m_blockchain.offset()); return; } + current_index = blocks_start_height; if (hashes.size() + current_index < stop_height) { drop_from_short_history(short_chain_history, 3); std::vector<crypto::hash>::iterator right = hashes.end(); @@ -3149,7 +3150,6 @@ void wallet2::fast_refresh(uint64_t stop_height, uint64_t &blocks_start_height, short_chain_history.push_front(*right); } } - current_index = blocks_start_height; for(auto& bl_id: hashes) { if(current_index >= m_blockchain.size()) |