Merge ec0453c into merged_master (Bitcoin PR bitcoin-core/gui#102)

apoelstra · Nov 30, 2020 · 7940197 · 7940197
2 parents 38c5aa7 + ec0453c
commit 7940197
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
@@ -14,6 +14,7 @@
 #include <interfaces/wallet.h>
 #include <qt/guiutil.h>
 #include <qt/networkstyle.h>
+#include <qt/walletmodel.h>
 #include <util/system.h>
 #include <util/translation.h>
 
@@ -197,6 +198,7 @@ void SplashScreen::subscribeToCoreSignals()
 void SplashScreen::handleLoadWallet()
 {
 #ifdef ENABLE_WALLET
+    if (!WalletModel::isWalletEnabled()) return;
     m_handler_load_wallet = m_node->walletClient().handleLoadWallet([this](std::unique_ptr<interfaces::Wallet> wallet) {
         m_connected_wallet_handlers.emplace_back(wallet->handleShowProgress(std::bind(ShowProgress, this, std::placeholders::_1, std::placeholders::_2, false)));
         m_connected_wallets.emplace_back(std::move(wallet));