kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #636

Browse source 
616df49 Revert "Merge pull request #632" (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2016-01-31 15:50:52 +02:00
commit 5feebb4d87
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wallet/wallet2.cpp
View file

@ -753,15 +753,7 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re
bool error = false;
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);
}
catch (...)
{
pull_thread.join();
throw;
}
process_blocks(blocks_start_height, blocks, added_blocks);
blocks_fetched += added_blocks;
pull_thread.join();
if(!added_blocks)