Browse Source

Merge #8678: [Qt][CoinControl] fix UI bug that could result in paying unexpected fee

0480293 [Qt][CoinControl] fix UI bug that could result in paying unexpected fee (Jonas Schnelli)
0.14
Jonas Schnelli 8 years ago
parent
commit
702e6e059b
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
  1. 5
      src/qt/sendcoinsdialog.cpp

5
src/qt/sendcoinsdialog.cpp

@ -589,6 +589,9 @@ void SendCoinsDialog::updateGlobalFeeVariables() @@ -589,6 +589,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
{
@ -781,7 +784,7 @@ void SendCoinsDialog::coinControlUpdateLabels() @@ -781,7 +784,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
{

Loading…
Cancel
Save