aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2017-02-21 15:13:13 +0100
committerWladimir J. van der Laan <[email protected]>2017-02-21 15:13:17 +0100
commit8528d6ac6d51fe1a2d6fc9f0e2591c5503798bd5 (patch)
tree5b71871954c9eae2bb556c257e5763e761f41876 /src
parentMerge #9798: Fix Issue #9775 (Check returned value of fopen) (diff)
parentFix segfault crash when shutdown the GUI in disablewallet mode (diff)
downloaddiscoin-8528d6ac6d51fe1a2d6fc9f0e2591c5503798bd5.tar.xz
discoin-8528d6ac6d51fe1a2d6fc9f0e2591c5503798bd5.zip
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)
Diffstat (limited to 'src')
-rw-r--r--src/qt/bitcoingui.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 1c1acb6b1..be79a6799 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -518,7 +518,10 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
// Propagate cleared model to child objects
rpcConsole->setClientModel(nullptr);
#ifdef ENABLE_WALLET
- walletFrame->setClientModel(nullptr);
+ if (walletFrame)
+ {
+ walletFrame->setClientModel(nullptr);
+ }
#endif // ENABLE_WALLET
unitDisplayControl->setOptionsModel(nullptr);
}