Skip to content

Commit ec0453c

Browse files
author
MarcoFalke
committed
Merge bitcoin-core#102: Fix SplashScreen crash when run with -disablewallet
c056064 gui: Fix SplashScreen crash when run with -disablewallet (Hennadii Stepanov) Pull request description: This PR fixes the bug introduced in bitcoin/bitcoin#19099: ``` $ src/qt/bitcoin-qt -disablewallet bitcoin-qt: interfaces/node.cpp:236: auto interfaces::(anonymous namespace)::NodeImpl::walletClient()::(anonymous class)::operator()() const: Assertion `"m_context->wallet_client" && check' failed. Aborted (core dumped) ``` ACKs for top commit: Sjors: tACK c056064 promag: ACK c056064. Tree-SHA512: 263d9efd5899cc6e447dfc5142bf911ca627149fac0a1c5e5b58dd196aa5e0d12fe13e3f750fb5f3c4338222f7959935d2f77391263f967dbca2e0e79a416a29
2 parents cd6e193 + c056064 commit ec0453c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/qt/splashscreen.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <interfaces/wallet.h>
1515
#include <qt/guiutil.h>
1616
#include <qt/networkstyle.h>
17+
#include <qt/walletmodel.h>
1718
#include <util/system.h>
1819
#include <util/translation.h>
1920

@@ -196,6 +197,7 @@ void SplashScreen::subscribeToCoreSignals()
196197
void SplashScreen::handleLoadWallet()
197198
{
198199
#ifdef ENABLE_WALLET
200+
if (!WalletModel::isWalletEnabled()) return;
199201
m_handler_load_wallet = m_node->walletClient().handleLoadWallet([this](std::unique_ptr<interfaces::Wallet> wallet) {
200202
m_connected_wallet_handlers.emplace_back(wallet->handleShowProgress(std::bind(ShowProgress, this, std::placeholders::_1, std::placeholders::_2, false)));
201203
m_connected_wallets.emplace_back(std::move(wallet));

0 commit comments

Comments
 (0)