From 068996daa55e5ac89aaead6afb7b393550ec0933 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Tue, 4 Jun 2013 23:44:53 -0400 Subject: [PATCH] osx: fix bitcoin-qt startup crash when clicking dock icon Crash probably introduced by 4d17a1b0. Inialize the window to NULL and verify it before use. Rebased-By: Wladimir J. van der Laan --- src/qt/macdockiconhandler.mm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm index b6ea8e1d03d..02117536cbd 100644 --- a/src/qt/macdockiconhandler.mm +++ b/src/qt/macdockiconhandler.mm @@ -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(); }