diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-03-28 09:08:01 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-04-02 10:12:43 +0200 |
| commit | 0df22ed6fd0b83d181dc8ce3786a47da0f1d58ae (patch) | |
| tree | 4e6b8504477eefbd1b60670d01fed050bb6ce45d /src/wallet/feebumper.cpp | |
| parent | 44cabe6380d63505b30d4f854bbbe7926201a2a9 (diff) | |
| download | bitcoin-0df22ed6fd0b83d181dc8ce3786a47da0f1d58ae.tar.xz | |
Cancel feebump is vErrors is not empty
Diffstat (limited to 'src/wallet/feebumper.cpp')
| -rw-r--r-- | src/wallet/feebumper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index 9ebb36f36e..73de239529 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -232,7 +232,9 @@ CFeeBumper::CFeeBumper(const CWallet *pWallet, const uint256 txidIn, int newConf bool CFeeBumper::commit(CWallet *pWallet) { AssertLockHeld(pWallet->cs_wallet); - vErrors.clear(); + if (!vErrors.empty() || currentResult != BumpFeeResult::OK) { + return false; + } if (txid.IsNull() || !pWallet->mapWallet.count(txid)) { vErrors.push_back("Invalid or non-wallet transaction id"); currentResult = BumpFeeResult::MISC_ERROR; |