diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-06-27 11:48:27 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-06-27 11:48:27 -0500 |
| commit | 0a1eaf26f9dd6b762c2582ee12603b2a4671c735 (patch) | |
| tree | ba0e98de3e0834da80896acc980366ac6edb3b2f | |
| parent | Merge pull request #8880 (diff) | |
| parent | wallet2: do not lose exception in current thread on refresh (diff) | |
| download | monero-0a1eaf26f9dd6b762c2582ee12603b2a4671c735.tar.xz | |
Merge pull request #8884
eeda4a8 wallet2: do not lose exception in current thread on refresh (Crypto City
f868768 wallet2: fix missing exceptions from failing wallet refresh (Crypto City)
| -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 b9cae0cac..51ee9cdca 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3952,6 +3952,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; @@ -4016,6 +4017,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(); |