highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-07 05:31:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt, refactor: Keep AskPassphraseDialog in the main event loop

Browse Source
This commit is contained in:
Hennadii Stepanov 2021-06-07 18:34:14 +03:00
parent 6f6fde30e7
commit 7fa91e8312
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/qt/walletview.cpp
View File

@ -205,11 +205,10 @@ void WalletView::showOutOfSyncWarning(bool fShow)
void WalletView::encryptWallet() void WalletView::encryptWallet()
{ {
AskPassphraseDialog dlg(AskPassphraseDialog::Encrypt, this); auto dlg = new AskPassphraseDialog(AskPassphraseDialog::Encrypt, this);
dlg.setModel(walletModel); dlg->setModel(walletModel);
dlg.exec(); connect(dlg, &QDialog::finished, this, &WalletView::encryptionStatusChanged);
GUIUtil::ShowModalDialogAndDeleteOnClose(dlg);
Q_EMIT encryptionStatusChanged();
} }
void WalletView::backupWallet() void WalletView::backupWallet()
@ -234,19 +233,18 @@ void WalletView::backupWallet()
void WalletView::changePassphrase() void WalletView::changePassphrase()
{ {
AskPassphraseDialog dlg(AskPassphraseDialog::ChangePass, this); auto dlg = new AskPassphraseDialog(AskPassphraseDialog::ChangePass, this);
dlg.setModel(walletModel); dlg->setModel(walletModel);
dlg.exec(); GUIUtil::ShowModalDialogAndDeleteOnClose(dlg);
} }
void WalletView::unlockWallet() void WalletView::unlockWallet()
{ {
// Unlock wallet when requested by wallet model // Unlock wallet when requested by wallet model
if (walletModel->getEncryptionStatus() == WalletModel::Locked) if (walletModel->getEncryptionStatus() == WalletModel::Locked) {
{ auto dlg = new AskPassphraseDialog(AskPassphraseDialog::Unlock, this);
AskPassphraseDialog dlg(AskPassphraseDialog::Unlock, this); dlg->setModel(walletModel);
dlg.setModel(walletModel); GUIUtil::ShowModalDialogAndDeleteOnClose(dlg);
dlg.exec();
} }
} }