Merge 8d39c636aa into merged_master (Bitcoin PR #16952)

This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:32 +00:00
commit ff55bb704c

View file

@ -4017,6 +4017,7 @@ DBErrors CWallet::ZapSelectTx(std::vector<uint256>& vHashIn, std::vector<uint256
const auto& it = mapWallet.find(hash);
wtxOrdered.erase(it->second.m_it_wtxOrdered);
mapWallet.erase(it);
NotifyTransactionChanged(this, hash, CT_DELETED);
}
if (nZapSelectTxRet == DBErrors::NEED_REWRITE)