Merge d67883d into merged_master (Bitcoin PR bitcoin-core/gui#43)

apoelstra · apoelstra · commit c257b0d1781c · 2020-12-01T16:45:22.000Z
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -664,14 +664,15 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
 {
     if (!walletFrame) return;
     if (!walletFrame->addWallet(walletModel)) return;
-    const QString display_name = walletModel->getDisplayName();
-    setWalletActionsEnabled(true);
     rpcConsole->addWallet(walletModel);
-    m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
-    if (m_wallet_selector->count() == 2) {
+    if (m_wallet_selector->count() == 0) {
+        setWalletActionsEnabled(true);
+    } else if (m_wallet_selector->count() == 1) {
         m_wallet_selector_label_action->setVisible(true);
         m_wallet_selector_action->setVisible(true);
     }
+    const QString display_name = walletModel->getDisplayName();
+    m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
 }
 
 void BitcoinGUI::removeWallet(WalletModel* walletModel)

Original file line number	Diff line number	Diff line change
`@@ -664,14 +664,15 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)`
`664`	`664`	`{`
`665`	`665`	`if (!walletFrame) return;`
`666`	`666`	`if (!walletFrame->addWallet(walletModel)) return;`
`667`		`- const QString display_name = walletModel->getDisplayName();`
`668`		`- setWalletActionsEnabled(true);`
`669`	`667`	`rpcConsole->addWallet(walletModel);`
`670`		`- m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));`
`671`		`- if (m_wallet_selector->count() == 2) {`
	`668`	`+ if (m_wallet_selector->count() == 0) {`
	`669`	`+ setWalletActionsEnabled(true);`
	`670`	`+ } else if (m_wallet_selector->count() == 1) {`
`672`	`671`	`m_wallet_selector_label_action->setVisible(true);`
`673`	`672`	`m_wallet_selector_action->setVisible(true);`
`674`	`673`	`}`
	`674`	`+ const QString display_name = walletModel->getDisplayName();`
	`675`	`+ m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));`
`675`	`676`	`}`
`676`	`677`
`677`	`678`	`void BitcoinGUI::removeWallet(WalletModel* walletModel)`