zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Wladimir J. van der Laan 2011-11-13 08:45:29 +01:00
parent 6be6be2ed9
commit 405ce5a876
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/bitcoingui.cpp
View File

@ -478,11 +478,11 @@ void BitcoinGUI::error(const QString &title, const QString &message)
void BitcoinGUI::changeEvent(QEvent *e) void BitcoinGUI::changeEvent(QEvent *e)
{ {
#ifndef Q_WS_MAC // Ignored on Mac #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(); hide();
e->ignore(); e->ignore();