Merge afab1312c5 into merged_master (Bitcoin PR #16118)

This commit is contained in:
Andrew Poelstra 2020-11-06 15:20:14 +00:00
commit 7bef011d2a

View file

@ -335,7 +335,7 @@ void BitcoinGUI::createActions()
openAction->setStatusTip(tr("Open a payment request"));
m_open_wallet_action = new QAction(tr("Open Wallet"), this);
m_open_wallet_action->setMenu(new QMenu(this));
m_open_wallet_action->setEnabled(false);
m_open_wallet_action->setStatusTip(tr("Open a wallet"));
m_close_wallet_action = new QAction(tr("Close Wallet..."), this);
@ -633,6 +633,9 @@ void BitcoinGUI::setWalletController(WalletController* wallet_controller)
m_wallet_controller = wallet_controller;
m_open_wallet_action->setEnabled(true);
m_open_wallet_action->setMenu(new QMenu(this));
connect(wallet_controller, &WalletController::walletAdded, this, &BitcoinGUI::addWallet);
connect(wallet_controller, &WalletController::walletRemoved, this, &BitcoinGUI::removeWallet);