aboutsummaryrefslogtreecommitdiff
path: root/src/qt/coincontroldialog.cpp
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2015-11-25 13:38:44 +0100
committerJonas Schnelli <dev@jonasschnelli.ch>2015-11-30 14:09:05 +0100
commit31b508a18b6c7526d153659894f4418bfca99ee2 (patch)
tree7942c05cf4f6f0447fb435cb3f1adf49c17a04f5 /src/qt/coincontroldialog.cpp
parent80462dda0a5ed1db22560380fef0f87df20253c1 (diff)
[Qt] make use of the nMinimumTotalFee (absolute) in coincontrols fee calculation
Diffstat (limited to 'src/qt/coincontroldialog.cpp')
-rw-r--r--src/qt/coincontroldialog.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 33344938df..0f42243047 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -549,6 +549,9 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
// Fee
nPayFee = CWallet::GetMinimumFee(nBytes, nTxConfirmTarget, mempool);
+ if (nPayFee > 0 && coinControl->nMinimumTotalFee > nPayFee)
+ nPayFee = coinControl->nMinimumTotalFee;
+
// Allow free? (require at least hard-coded threshold and default to that if no estimate)
double dPriorityNeeded = std::max(mempoolEstimatePriority, AllowFreeThreshold());