diff options
| author | Gregory Sanders <gsanders87@gmail.com> | 2019-09-16 12:26:58 -0400 |
|---|---|---|
| committer | Gregory Sanders <gsanders87@gmail.com> | 2019-09-26 16:23:32 -0400 |
| commit | b34f0180e39fc95d88596a987724b994707e2552 (patch) | |
| tree | e9ddc512f6ed457aaa4d643c563bafae4a709e57 /src/qt/receivecoinsdialog.cpp | |
| parent | f50785ab56c0c094960c7049cfe9209b101e2823 (diff) | |
| download | bitcoin-b34f0180e39fc95d88596a987724b994707e2552.tar.xz | |
Revert "gui: Generate bech32 addresses by default (take 2, fixup)"
This reverts commit fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234.
Diffstat (limited to 'src/qt/receivecoinsdialog.cpp')
| -rw-r--r-- | src/qt/receivecoinsdialog.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index df8d5115d5..de453cf743 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -7,7 +7,6 @@ #include <qt/receivecoinsdialog.h> #include <qt/forms/ui_receivecoinsdialog.h> -#include <interfaces/node.h> #include <qt/addresstablemodel.h> #include <qt/optionsmodel.h> #include <qt/platformstyle.h> @@ -93,16 +92,10 @@ void ReceiveCoinsDialog::setModel(WalletModel *_model) // Last 2 columns are set by the columnResizingFixer, when the table geometry is ready. columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH, this); - if (model->node().isAddressTypeSet()) { - // user explicitly set the type, use it - if (model->wallet().getDefaultAddressType() == OutputType::BECH32) { - ui->useBech32->setCheckState(Qt::Checked); - } else { - ui->useBech32->setCheckState(Qt::Unchecked); - } - } else { - // Always fall back to bech32 in the gui + if (model->wallet().getDefaultAddressType() == OutputType::BECH32) { ui->useBech32->setCheckState(Qt::Checked); + } else { + ui->useBech32->setCheckState(Qt::Unchecked); } // Set the button to be enabled or disabled based on whether the wallet can give out new addresses. |