diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-09-07 16:03:08 +0200 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-09-21 02:43:47 +0000 |
| commit | 8e0338227979eb619da2dcacc505f4f229b67da0 (patch) | |
| tree | 8d3c1073f8fea346f6a1b1a66c5d1b85b3e16ae9 /src/qt | |
| parent | 6b07362b375feab71f0d0d3ed00a5b16944f4d12 (diff) | |
| download | bitcoin-8e0338227979eb619da2dcacc505f4f229b67da0.tar.xz | |
[Qt][CoinControl] fix UI bug that could result in paying unexpected fee
Github-Pull: #8678
Rebased-From: 04802930d4e1f565b3c36e1a806fbe9cd4809937
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 6d50be56ec..546003622c 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -592,6 +592,9 @@ void SendCoinsDialog::updateGlobalFeeVariables() { nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value(); payTxFee = CFeeRate(0); + + // set nMinimumTotalFee to 0 to not accidentally pay a custom fee + CoinControlDialog::coinControl->nMinimumTotalFee = 0; } else { @@ -790,7 +793,7 @@ void SendCoinsDialog::coinControlUpdateLabels() ui->radioCustomAtLeast->setVisible(true); // only enable the feature if inputs are selected - ui->radioCustomAtLeast->setEnabled(CoinControlDialog::coinControl->HasSelected()); + ui->radioCustomAtLeast->setEnabled(ui->radioCustomFee->isChecked() && !ui->checkBoxMinimumFee->isChecked() &&CoinControlDialog::coinControl->HasSelected()); } else { |