rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-30 06:43:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6235

Browse Source 
5cbb17b9 wallet2: fix hang in wallet refresh (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-02-28 19:48:41 -08:00
commit a6cf4b09e7
No known key found for this signature in database
GPG Key ID: C64552D877C32479
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/wallet2.cpp
View File

@ -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()); MERROR("Blocks start before blockchain offset: " << blocks_start_height << " " << m_blockchain.offset());
return; return;
} }
current_index = blocks_start_height;
if (hashes.size() + current_index < stop_height) { if (hashes.size() + current_index < stop_height) {
drop_from_short_history(short_chain_history, 3); drop_from_short_history(short_chain_history, 3);
std::vector<crypto::hash>::iterator right = hashes.end(); 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); short_chain_history.push_front(*right);
} }
} }
current_index = blocks_start_height;
for(auto& bl_id: hashes) for(auto& bl_id: hashes)
{ {
if(current_index >= m_blockchain.size()) if(current_index >= m_blockchain.size())