Merge pull request #633

80882ac wallet: guard against exception in process_blocks (moneromooo-monero)
2016-01-31 15:21:13 +02:00 · 2016-01-31 15:21:13 +02:00 · 8d976a0683
parent 58f890652e 80882ac6dd
commit 8d976a0683
1 changed files with 2 additions and 0 deletions
--- 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 << ")...");