diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:50:52 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:50:52 +0200 |
| commit | 5feebb4d87ec9c53b9482ef388b56f78b1dabab5 (patch) | |
| tree | ea3008ee2e52f9a416564add57d4793e95250852 /src/wallet/wallet2.cpp | |
| parent | Merge pull request #635 (diff) | |
| parent | Revert "Merge pull request #632" (diff) | |
| download | monero-5feebb4d87ec9c53b9482ef388b56f78b1dabab5.tar.xz | |
Merge pull request #636
616df49 Revert "Merge pull request #632" (Riccardo Spagni)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 49e090904..40f372c35 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -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) |