Browse Source

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
0.8
Wladimir J. van der Laan 13 years ago
parent
commit
405ce5a876
  1. 6
      src/qt/bitcoingui.cpp

6
src/qt/bitcoingui.cpp

@ -478,11 +478,11 @@ void BitcoinGUI::error(const QString &title, const QString &message) @@ -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();

Loading…
Cancel
Save