Browse Source

[Qt] Change RBF checkbox to reflect -walletrbf setting

Before this commit, the checkbox would always start off unchecked. After this
commit it will respect the -walletrbf setting (which is currently false by
default).
pull/1/head
Russell Yanofsky 6 years ago
parent
commit
c4e4792c53
  1. 1
      src/qt/sendcoinsdialog.cpp
  2. 5
      src/qt/walletmodel.cpp
  3. 2
      src/qt/walletmodel.h

1
src/qt/sendcoinsdialog.cpp

@ -112,6 +112,7 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *p @@ -112,6 +112,7 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *p
ui->groupCustomFee->button((int)std::max(0, std::min(1, settings.value("nCustomFeeRadio").toInt())))->setChecked(true);
ui->customFee->setValue(settings.value("nTransactionFee").toLongLong());
ui->checkBoxMinimumFee->setChecked(settings.value("fPayOnlyMinFee").toBool());
ui->optInRBF->setCheckState(model->getDefaultWalletRbf() ? Qt::Checked : Qt::Unchecked);
minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());
}

5
src/qt/walletmodel.cpp

@ -706,3 +706,8 @@ int WalletModel::getDefaultConfirmTarget() const @@ -706,3 +706,8 @@ int WalletModel::getDefaultConfirmTarget() const
{
return nTxConfirmTarget;
}
bool WalletModel::getDefaultWalletRbf() const
{
return fWalletRbf;
}

2
src/qt/walletmodel.h

@ -213,6 +213,8 @@ public: @@ -213,6 +213,8 @@ public:
int getDefaultConfirmTarget() const;
bool getDefaultWalletRbf() const;
private:
CWallet *wallet;
bool fHaveWatchOnly;

Loading…
Cancel
Save