Skip to content

[Wallet][BUG] fix detection of wallet conflicts in CWallet::AddToWallet#1734

Merged
furszy merged 1 commit into
PIVX-Project:masterfrom
random-zebra:202007_backport-fix-7105
Jul 8, 2020
Merged

[Wallet][BUG] fix detection of wallet conflicts in CWallet::AddToWallet#1734
furszy merged 1 commit into
PIVX-Project:masterfrom
random-zebra:202007_backport-fix-7105

Conversation

@random-zebra
Copy link
Copy Markdown

Check for explicit wallet conflicts when fFromLoadWallet (from bitcoin/bitcoin@9ac63d6, wrongly backported in #970).

Check for explicit wallet conflicts when fFromLoadWallet
(from bitcoin/bitcoin@9ac63d6, wrongly
backported in PIVX-Project#970)
Copy link
Copy Markdown

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice find!, ACK 1839ec7

Copy link
Copy Markdown
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 1839ec7

@furszy furszy merged commit 78a4f68 into PIVX-Project:master Jul 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants