changeset 26678:b4b60ce5f4a3

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)
author Wladimir J. van der Laan <laanwj@gmail.com>
date Tue, 21 Feb 2017 15:13:13 +0100
parents 0f42f51f4fe7 ab05c3ed9dde
children 299bb45fc7ea 53ca106f0e69 ec26b0c88c74
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt/bitcoingui.cpp	Tue Feb 21 14:32:44 2017 +0100
+++ b/src/qt/bitcoingui.cpp	Tue Feb 21 15:13:13 2017 +0100
@@ -518,7 +518,10 @@
         // 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);
     }