@@ -731,9 +731,7 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
731
731
connect (wallet_view, &WalletView::encryptionStatusChanged, this , &BitcoinGUI::updateWalletStatus);
732
732
connect (wallet_view, &WalletView::incomingTransaction, this , &BitcoinGUI::incomingTransaction);
733
733
connect (this , &BitcoinGUI::setPrivacy, wallet_view, &WalletView::setPrivacy);
734
- const bool privacy = isPrivacyModeActivated ();
735
- wallet_view->setPrivacy (privacy);
736
- enableHistoryAction (privacy);
734
+ wallet_view->setPrivacy (isPrivacyModeActivated ());
737
735
const QString display_name = walletModel->getDisplayName ();
738
736
m_wallet_selector->addItem (display_name, QVariant::fromValue (walletModel));
739
737
}
@@ -769,6 +767,7 @@ void BitcoinGUI::setCurrentWallet(WalletModel* wallet_model)
769
767
break ;
770
768
}
771
769
}
770
+ setWalletActionsEnabled (true );
772
771
updateWindowTitle ();
773
772
m_migrate_wallet_action->setEnabled (wallet_model->wallet ().isLegacy ());
774
773
}
@@ -805,6 +804,9 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
805
804
m_close_wallet_action->setEnabled (enabled);
806
805
m_close_all_wallets_action->setEnabled (enabled);
807
806
m_migrate_wallet_action->setEnabled (enabled);
807
+ #ifdef ENABLE_WALLET
808
+ enableHistoryAction (enabled || isPrivacyModeActivated ());
809
+ #endif // ENABLE_WALLET
808
810
}
809
811
810
812
void BitcoinGUI::createTrayIcon ()
0 commit comments