From 405ce5a876f96a4fbd136129269df0edeb4c7a55 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 13 Nov 2011 08:45:29 +0100
Subject: Add model null pointer check (solves issue #595 and
 https://github.com/laanwj/bitcoin-qt/issues/29)

Missed this one before, which can be triggered in race condition if window event arrives before model is set
---
 src/qt/bitcoingui.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/qt/bitcoingui.cpp')

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 5ae3ce33e8..8641c723b0 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -478,11 +478,11 @@ void BitcoinGUI::error(const QString &title, const QString &message)
 void BitcoinGUI::changeEvent(QEvent *e)
 {
 #ifndef Q_WS_MAC // Ignored on Mac
-    if (e->type() == QEvent::WindowStateChange)
+    if(e->type() == QEvent::WindowStateChange)
     {
-        if (clientModel->getOptionsModel()->getMinimizeToTray())
+        if(clientModel && clientModel->getOptionsModel()->getMinimizeToTray())
         {
-            if (isMinimized())
+            if(isMinimized())
             {
                 hide();
                 e->ignore();
-- 
cgit v1.2.3