Merge pull request #6235
5cbb17b9
wallet2: fix hang in wallet refresh (moneromooo-monero)
This commit is contained in:
commit
a6cf4b09e7
|
@ -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())
|
||||
|
|
Loading…
Reference in New Issue