cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-19 20:09:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

osx: fix bitcoin-qt startup crash when clicking dock icon

Browse Source 
Crash probably introduced by 4d17a1b0.
Inialize the window to NULL and verify it before use.

Rebased-By: Wladimir J. van der Laan <laanwj@gmail.com>
This commit is contained in:
Cory Fields 2013-06-04 23:44:53 -04:00 committed by Wladimir J. van der Laan
parent 99f73bd2fd
commit 068996daa5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qt/macdockiconhandler.mm
View File

@ -52,6 +52,8 @@ MacDockIconHandler::MacDockIconHandler() : QObject()
this->m_dummyWidget = new QWidget();
this->m_dockMenu = new QMenu(this->m_dummyWidget);
qt_mac_set_dock_menu(this->m_dockMenu);
this->setMainWindow(NULL);
[pool release];
}
@ -100,8 +102,11 @@ MacDockIconHandler *MacDockIconHandler::instance()
void MacDockIconHandler::handleDockIconClickEvent()
{
this->mainWindow->activateWindow();
this->mainWindow->show();
if (this->mainWindow)
{
this->mainWindow->activateWindow();
this->mainWindow->show();
}
emit this->dockIconClicked();
}