Merge #9817: Fix segfault crash when shutdown the GUI in disablewallet mode

312c4f1 Fix segfault crash when shutdown the GUI in disablewallet mode (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2017-02-21 15:13:13 +01:00
commit 8528d6ac6d
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -518,7 +518,10 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
// Propagate cleared model to child objects // Propagate cleared model to child objects
rpcConsole->setClientModel(nullptr); rpcConsole->setClientModel(nullptr);
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
walletFrame->setClientModel(nullptr); if (walletFrame)
{
walletFrame->setClientModel(nullptr);
}
#endif // ENABLE_WALLET #endif // ENABLE_WALLET
unitDisplayControl->setOptionsModel(nullptr); unitDisplayControl->setOptionsModel(nullptr);
} }