@@ -714,6 +714,8 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
714
714
WalletView* wallet_view = new WalletView (walletModel, platformStyle, walletFrame);
715
715
if (!walletFrame->addView (wallet_view)) return ;
716
716
717
+ wallet_view->setPrivacy (isPrivacyModeActivated ());
718
+
717
719
rpcConsole->addWallet (walletModel);
718
720
if (m_wallet_selector->count () == 0 ) {
719
721
setWalletActionsEnabled (true );
@@ -731,9 +733,6 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
731
733
connect (wallet_view, &WalletView::encryptionStatusChanged, this , &BitcoinGUI::updateWalletStatus);
732
734
connect (wallet_view, &WalletView::incomingTransaction, this , &BitcoinGUI::incomingTransaction);
733
735
connect (this , &BitcoinGUI::setPrivacy, wallet_view, &WalletView::setPrivacy);
734
- const bool privacy = isPrivacyModeActivated ();
735
- wallet_view->setPrivacy (privacy);
736
- enableHistoryAction (privacy);
737
736
const QString display_name = walletModel->getDisplayName ();
738
737
m_wallet_selector->addItem (display_name, QVariant::fromValue (walletModel));
739
738
}
@@ -769,6 +768,7 @@ void BitcoinGUI::setCurrentWallet(WalletModel* wallet_model)
769
768
break ;
770
769
}
771
770
}
771
+ setWalletActionsEnabled (true );
772
772
updateWindowTitle ();
773
773
m_migrate_wallet_action->setEnabled (wallet_model->wallet ().isLegacy ());
774
774
}
@@ -805,6 +805,9 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
805
805
m_close_wallet_action->setEnabled (enabled);
806
806
m_close_all_wallets_action->setEnabled (enabled);
807
807
m_migrate_wallet_action->setEnabled (enabled);
808
+ #ifdef ENABLE_WALLET
809
+ if (enabled) enableHistoryAction (isPrivacyModeActivated ());
810
+ #endif // ENABLE_WALLET
808
811
}
809
812
810
813
void BitcoinGUI::createTrayIcon ()
0 commit comments