Permalink
Browse files

Make sure conflicted wallet tx's update balances

Github-Pull: #7306
Rebased-From: f61766b
  • Loading branch information...
morcos authored and laanwj committed Jan 6, 2016
1 parent 9265e89 commit 4707797df2d41d46a40f59977738e58f87a949fe
Showing with 7 additions and 0 deletions.
  1. +7 −0 src/wallet/wallet.cpp
View
@@ -811,6 +811,13 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx)
}
iter++;
}
+ // If a transaction changes 'conflicted' state, that changes the balance
+ // available of the outputs it spends. So force those to be recomputed
+ BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+ {
+ if (mapWallet.count(txin.prevout.hash))
+ mapWallet[txin.prevout.hash].MarkDirty();
+ }
}
}
}

0 comments on commit 4707797

Please sign in to comment.