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)
This commit is contained in:
commit
ab826008d6
|
@ -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();
|
||||||
|
|
Loading…
Reference in New Issue