Skip to content

Commit 6431f71

Browse files
hebastoknst
authored andcommitted
Merge bitcoin-core/gui#393: Fix regression in "Encrypt Wallet" menu item
d54d949 qt: Fix regression in "Encrypt Wallet" menu item (Hennadii Stepanov) Pull request description: Fix dashpay#392. Adding a new item to the `m_wallet_selector` must follow the establishment of a connection between the `WalletView::encryptionStatusChanged` signal and the `BitcoinGUI::updateWalletStatus` slot. This was a regression introduced in bitcoin@20e2e24 (dashpay#29). --- An _encrypted_ wallet being auto-loaded at the GUI startup: - on master (eaf09bd) ![Screenshot from 2021-08-03 22-38-49](https://user-images.githubusercontent.com/32963518/128075837-cdbb2047-5327-43ea-b2d5-2dcdef67cdc0.png) - with this PR ![Screenshot from 2021-08-03 22-34-58](https://user-images.githubusercontent.com/32963518/128075572-cb727652-ad44-4b85-bf64-edcd19f9dea1.png) ACKs for top commit: achow101: ACK d54d949 jarolrod: ACK d54d949 Tree-SHA512: 669615ec8e1517c2f4cdf59bd11a7c85be793ba0dda112361cf95e6c2f0636215fed331d26a86dc9b779a49defae1b248232f98dab449584376c111c288e87bb
1 parent fc900a8 commit 6431f71

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/qt/bitcoingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -923,8 +923,6 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
923923
} else if (m_wallet_selector->count() == 1) {
924924
m_wallet_selector_action->setVisible(true);
925925
}
926-
const QString display_name = walletModel->getDisplayName();
927-
m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
928926

929927
connect(wallet_view, &WalletView::outOfSyncWarningClicked, this, &BitcoinGUI::showModalOverlay);
930928
connect(wallet_view, &WalletView::transactionClicked, this, &BitcoinGUI::gotoHistoryPage);
@@ -937,6 +935,8 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
937935
connect(wallet_view, &WalletView::hdEnabledStatusChanged, this, &BitcoinGUI::updateWalletStatus);
938936
connect(this, &BitcoinGUI::setPrivacy, wallet_view, &WalletView::setPrivacy);
939937
wallet_view->setPrivacy(isPrivacyModeActivated());
938+
const QString display_name = walletModel->getDisplayName();
939+
m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
940940
}
941941

942942
void BitcoinGUI::removeWallet(WalletModel* walletModel)

0 commit comments

Comments
 (0)