highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-18 22:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cancel feebump is vErrors is not empty

Browse Source
This commit is contained in:
Jonas Schnelli
2017-03-28 09:08:01 +02:00
parent 44cabe6380
commit 0df22ed6fd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/feebumper.cpp
View File

@@ -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;