[Qt] make use of the nMinimumTotalFee (absolute) in coincontrols fee calculation

This commit is contained in:
Jonas Schnelli 2015-11-25 13:38:44 +01:00
parent 80462dda0a
commit 31b508a18b
No known key found for this signature in database
GPG key ID: 29D4BCB6416F53EC

View file

@ -549,6 +549,9 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
// Fee // Fee
nPayFee = CWallet::GetMinimumFee(nBytes, nTxConfirmTarget, mempool); 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) // Allow free? (require at least hard-coded threshold and default to that if no estimate)
double dPriorityNeeded = std::max(mempoolEstimatePriority, AllowFreeThreshold()); double dPriorityNeeded = std::max(mempoolEstimatePriority, AllowFreeThreshold());