mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-12-23 04:58:52 +00:00
Merge pull request #636
616df49
Revert "Merge pull request #632" (Riccardo Spagni)
This commit is contained in:
commit
5feebb4d87
@ -753,15 +753,7 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
|
|||||||
bool error = false;
|
bool error = false;
|
||||||
pull_thread = std::thread([&]{pull_next_blocks(start_height, next_blocks_start_height, short_chain_history, blocks, next_blocks, error);});
|
pull_thread = std::thread([&]{pull_next_blocks(start_height, next_blocks_start_height, short_chain_history, blocks, next_blocks, error);});
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
process_blocks(blocks_start_height, blocks, added_blocks);
|
process_blocks(blocks_start_height, blocks, added_blocks);
|
||||||
}
|
|
||||||
catch (...)
|
|
||||||
{
|
|
||||||
pull_thread.join();
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
blocks_fetched += added_blocks;
|
blocks_fetched += added_blocks;
|
||||||
pull_thread.join();
|
pull_thread.join();
|
||||||
if(!added_blocks)
|
if(!added_blocks)
|
||||||
|
Loading…
Reference in New Issue
Block a user