Merge pull request #8917

835896e wallet2: do not lose exception in current thread on refresh (Crypto City) 62bb95b wallet2: fix missing exceptions from failing wallet refresh (Crypto City)
monero-project · Jul 7, 2023 · ab82600 · ab82600
2 parents 4dc727b + 835896e
commit ab82600
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
@@ -3842,6 +3842,7 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
         catch (const std::exception &e)
         {
           MERROR("Error parsing blocks: " << e.what());
+          exception = std::current_exception();
           error = true;
         }
         blocks_fetched += added_blocks;
@@ -3908,6 +3909,7 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
       {
         LOG_PRINT_L1("Another try pull_blocks (try_count=" << try_count << ")...");
         first = true;
+        last = false;
         start_height = 0;
         blocks.clear();
         parsed_blocks.clear();