aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/wallet/wallet2.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index d636b0e4b..06cf67e32 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -701,7 +701,15 @@ 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);});
- process_blocks(blocks_start_height, blocks, added_blocks);
+ try
+ {
+ process_blocks(blocks_start_height, blocks, added_blocks);
+ }
+ catch (...)
+ {
+ pull_thread.join();
+ throw;
+ }
blocks_fetched += added_blocks;
pull_thread.join();
if(!added_blocks)