diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:21:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:21:13 +0200 |
| commit | 8d976a0683476517a69a5c3c9a5ac598965f61d9 (patch) | |
| tree | 98f63cb243dd942a422195bf209a2c2a425d6b6c /src/wallet/wallet2.cpp | |
| parent | Merge pull request #632 (diff) | |
| parent | wallet: guard against exception in process_blocks (diff) | |
| download | monero-8d976a0683476517a69a5c3c9a5ac598965f61d9.tar.xz | |
Merge pull request #633
80882ac wallet: guard against exception in process_blocks (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 28bc35feb..cf90d1aca 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -780,6 +780,8 @@ void wallet2::refresh(uint64_t start_height, uint64_t & blocks_fetched, bool& re catch (const std::exception&) { blocks_fetched += added_blocks; + if (pull_thread.joinable()) + pull_thread.join(); if(try_count < 3) { LOG_PRINT_L1("Another try pull_blocks (try_count=" << try_count << ")..."); |