[Qt][CoinControl] fix UI bug that could result in paying unexpected fee

This commit is contained in:
Jonas Schnelli 2016-09-07 16:03:08 +02:00
parent 5b2ea29cf4
commit 04802930d4
No known key found for this signature in database
GPG key ID: 29D4BCB6416F53EC

View file

@ -589,6 +589,9 @@ void SendCoinsDialog::updateGlobalFeeVariables()
{ {
nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value(); nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value();
payTxFee = CFeeRate(0); payTxFee = CFeeRate(0);
// set nMinimumTotalFee to 0 to not accidentally pay a custom fee
CoinControlDialog::coinControl->nMinimumTotalFee = 0;
} }
else else
{ {
@ -781,7 +784,7 @@ void SendCoinsDialog::coinControlUpdateLabels()
ui->radioCustomAtLeast->setVisible(true); ui->radioCustomAtLeast->setVisible(true);
// only enable the feature if inputs are selected // 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 else
{ {