Skip to content

Ensure external signer option remains disabled without signers #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hebasto merged 1 commit into from
Aug 6, 2021
Merged

Ensure external signer option remains disabled without signers #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/qt/createwalletdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
// set to true, enable it when isEncryptWalletChecked is false.
ui->disable_privkeys_checkbox->setEnabled(!checked);
#ifdef ENABLE_EXTERNAL_SIGNER
ui->external_signer_checkbox->setEnabled(!checked);
ui->external_signer_checkbox->setEnabled(m_has_signers && !checked);
Copy link
Member

@hebasto hebasto Aug 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe

Suggested change
ui->external_signer_checkbox->setEnabled(m_has_signers && !checked);
if (m_has_signers) {
ui->external_signer_checkbox->setEnabled(!checked);
}

to make the same code structure as it is in CreateWalletDialog::setSigners for better readability?

#endif
// When the disable_privkeys_checkbox is disabled, uncheck it.
if (!ui->disable_privkeys_checkbox->isEnabled()) {
Expand Down Expand Up @@ -115,7 +115,8 @@ CreateWalletDialog::~CreateWalletDialog()

void CreateWalletDialog::setSigners(const std::vector<ExternalSigner>& signers)
{
if (!signers.empty()) {
m_has_signers = !signers.empty();
if (m_has_signers) {
ui->external_signer_checkbox->setEnabled(true);
ui->external_signer_checkbox->setChecked(true);
ui->encrypt_wallet_checkbox->setEnabled(false);
Expand Down
1 change: 1 addition & 0 deletions src/qt/createwalletdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class CreateWalletDialog : public QDialog

private:
Ui::CreateWalletDialog *ui;
bool m_has_signers = false;
};

#endif // BITCOIN_QT_CREATEWALLETDIALOG_H