Merge ca80fec973 into merged_master (Bitcoin PR #16286)

This commit is contained in:
Andrew Poelstra 2020-11-09 03:58:17 +00:00
commit d363ffe5e4

View file

@ -2332,7 +2332,7 @@ void MaybeResendWalletTxs()
CWallet::Balance CWallet::GetBalance(const int min_depth, bool avoid_reuse) const
{
Balance ret;
isminefilter reuse_filter = avoid_reuse ? 0 : ISMINE_USED;
isminefilter reuse_filter = avoid_reuse ? ISMINE_NO : ISMINE_USED;
{
auto locked_chain = chain().lock();
LOCK(cs_wallet);