nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #632"

Browse Source 
This reverts commit 58f890652e, reversing
changes made to 39d73d2a27.
This commit is contained in:
Riccardo Spagni 2016-01-31 15:49:11 +02:00
parent f780f2e7ba
commit 616df496e9
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; 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)