Merge pull request #32 from tomasoashtonkai/Blackcoin-Lore

Wallet: call getConflicts excluding equivalent tx
2018-02-02 14:58:38 +01:00
parent 6a95766972 07d1c2c9fa
commit d0957c589d
1 changed files with 1 additions and 1 deletions
--- 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