diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -364,8 +364,13 @@ window->setCurrentWallet(walletModel->getWalletName()); } - connect(walletModel, &WalletModel::coinsSent, paymentServer, - &PaymentServer::fetchPaymentACK); + // This null check diverges from Core and is a temporary fix until PR15101 + // is backported. addWallet() is removed entirely in that backport, so no + // extra action will need to be taken. + if (paymentServer) { + connect(walletModel, &WalletModel::coinsSent, paymentServer, + &PaymentServer::fetchPaymentACK); + } connect(walletModel, &WalletModel::unload, this, &BitcoinApplication::removeWallet);