nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8917

Browse Source 
835896e wallet2: do not lose exception in current thread on refresh (Crypto City)
62bb95b wallet2: fix missing exceptions from failing wallet refresh (Crypto City)
This commit is contained in:
luigi1111 2023-07-06 21:40:45 -05:00
commit ab826008d6
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/wallet2.cpp
View File

@ -3842,6 +3842,7 @@ void wallet2::refresh(bool trusted_daemon, uint64_t start_height, uint64_t & blo
catch (const std::exception &e) catch (const std::exception &e)
{ {
MERROR("Error parsing blocks: " << e.what()); MERROR("Error parsing blocks: " << e.what());
exception = std::current_exception();
error = true; error = true;
} }
blocks_fetched += added_blocks; 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 << ")..."); LOG_PRINT_L1("Another try pull_blocks (try_count=" << try_count << ")...");
first = true; first = true;
last = false;
start_height = 0; start_height = 0;
blocks.clear(); blocks.clear();
parsed_blocks.clear(); parsed_blocks.clear();