monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 12:39:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #632

Browse source 
2cf8b32 wallet: guard against exception in process_blocks (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-01-31 15:20:47 +02:00
commit 58f890652e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/wallet/wallet2.cpp
View file

@ -753,7 +753,15 @@ 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)