GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 50f250a67d into merged_master (Bitcoin PR bitcoin/bitcoin#28542)

Browse source
This commit is contained in:
Byron Hambly 2025-08-05 14:22:16 +02:00
commit bf24d3692a
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
3 changed files with 115 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/wallet/wallet.cpp
View file

@ -1348,11 +1348,14 @@ void CWallet::MarkConflicted(const uint256& hashBlock, int conflicting_height, c
{
LOCK(cs_wallet);
int conflictconfirms = (m_last_block_processed_height - conflicting_height + 1) * -1;
// If number of conflict confirms cannot be determined, this means
// that the block is still unknown or not yet part of the main chain,
// for example when loading the wallet during a reindex. Do nothing in that
// case.
if (m_last_block_processed_height < 0 || conflicting_height < 0) {
return;
}
int conflictconfirms = (m_last_block_processed_height - conflicting_height + 1) * -1;
if (conflictconfirms >= 0)
return;