Merge pull request #7306
f61766b
Make sure conflicted wallet tx's update balances (Alex Morcos)
This commit is contained in:
commit
9de541a9c9
1 changed files with 7 additions and 0 deletions
|
@ -811,6 +811,13 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx)
|
||||||
}
|
}
|
||||||
iter++;
|
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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue