From 07d1c2c9faa77c38ad5629e7be2b579c8aea6a86 Mon Sep 17 00:00:00 2001 From: Tomasoashtonkai Date: Fri, 2 Feb 2018 13:43:10 +0100 Subject: [PATCH] Wallet: call getConflicts excluding equivalent tx Should fix the conflicts notification issue. --- src/wallet/wallet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index e1b546dc5..272ce0789 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1192,7 +1192,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletD // Notifications for existing transactions that now have conflicts with this one if (fInsertedNew) { - BOOST_FOREACH(const uint256& conflictHash, wtxIn.GetConflicts()) + BOOST_FOREACH(const uint256& conflictHash, wtxIn.GetConflicts(false)) { CWalletTx& txConflict = mapWallet[conflictHash]; NotifyTransactionChanged(this, conflictHash, CT_UPDATED); //Updates UI table