diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h --- a/src/qt/splashscreen.h +++ b/src/qt/splashscreen.h @@ -57,8 +57,6 @@ void unsubscribeFromCoreSignals(); /** Initiate shutdown */ void shutdown(); - /** Connect wallet signals to splash screen */ - void ConnectWallet(std::unique_ptr wallet); QPixmap pixmap; QString curMessage; diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -207,14 +207,6 @@ : _("press q to shutdown").translated) + strprintf("\n%d", nProgress) + "%"); } -#ifdef ENABLE_WALLET -void SplashScreen::ConnectWallet(std::unique_ptr 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)); -} -#endif void SplashScreen::subscribeToCoreSignals() { // Connect signals to client @@ -232,7 +224,10 @@ } m_handler_load_wallet = m_node->walletClient().handleLoadWallet( [this](std::unique_ptr wallet) { - ConnectWallet(std::move(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)); }); #endif }