aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2016-09-28 08:08:02 +0200
committerWladimir J. van der Laan <[email protected]>2016-09-28 08:09:42 +0200
commit14b7b3fb9f79aeadddb350c8ba795ebf0728a3ec (patch)
tree0b747bb7ad0066558b3a1f2a4149e38e6d9bcafe /src/wallet/wallet.cpp
parentMerge #8634: Add policy: null signature for failed CHECK(MULTI)SIG (diff)
parent[wallet, policy] ParameterInteraction: Don't allow 0 fee (diff)
downloaddiscoin-14b7b3fb9f79aeadddb350c8ba795ebf0728a3ec.tar.xz
discoin-14b7b3fb9f79aeadddb350c8ba795ebf0728a3ec.zip
Merge #8814: [wallet, policy] ParameterInteraction: Don't allow 0 fee
fa4bfb4 [wallet, policy] ParameterInteraction: Don't allow 0 fee (MarcoFalke)
Diffstat (limited to 'src/wallet/wallet.cpp')
-rw-r--r--src/wallet/wallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 85219c24c..43e22383f 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3492,7 +3492,7 @@ bool CWallet::ParameterInteraction()
if (mapArgs.count("-mintxfee"))
{
CAmount n = 0;
- if (!ParseMoney(mapArgs["-mintxfee"], n))
+ if (!ParseMoney(mapArgs["-mintxfee"], n) || 0 == n)
return InitError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
if (n > HIGH_TX_FEE_PER_KB)
InitWarning(AmountHighWarn("-mintxfee") + " " +