Browse Source

Cancel feebump is vErrors is not empty

0.15
Jonas Schnelli 8 years ago
parent
commit
0df22ed6fd
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
  1. 4
      src/wallet/feebumper.cpp

4
src/wallet/feebumper.cpp

@ -232,7 +232,9 @@ CFeeBumper::CFeeBumper(const CWallet *pWallet, const uint256 txidIn, int newConf
bool CFeeBumper::commit(CWallet *pWallet) bool CFeeBumper::commit(CWallet *pWallet)
{ {
AssertLockHeld(pWallet->cs_wallet); AssertLockHeld(pWallet->cs_wallet);
vErrors.clear(); if (!vErrors.empty() || currentResult != BumpFeeResult::OK) {
return false;
}
if (txid.IsNull() || !pWallet->mapWallet.count(txid)) { if (txid.IsNull() || !pWallet->mapWallet.count(txid)) {
vErrors.push_back("Invalid or non-wallet transaction id"); vErrors.push_back("Invalid or non-wallet transaction id");
currentResult = BumpFeeResult::MISC_ERROR; currentResult = BumpFeeResult::MISC_ERROR;

Loading…
Cancel
Save