diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-07-06 21:40:45 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-07-06 21:40:45 -0500 |
| commit | ab826008d614a3722398642942c291be9650be6d (patch) | |
| tree | fdd6bbd5368593d69e2261754d5a7bd070b86652 /src | |
| parent | Merge pull request #8916 (diff) | |
| parent | wallet2: do not lose exception in current thread on refresh (diff) | |
| download | monero-ab826008d614a3722398642942c291be9650be6d.tar.xz | |
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)
Diffstat (limited to 'src')
| -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 a2f930e8b..727ab32f9 100644 --- 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(); |