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

Merge pull request #2741 from theuni/fix-osx-dock 

osx: fix bitcoin-qt startup crash when clicking dock icon
This commit is contained in:
Wladimir J. van der Laan 2013-06-05 09:26:10 -07:00
parent c83d4d2170 99add01e76
commit 83f9b58f15
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/macdockiconhandler.mm
View File

@ -51,6 +51,7 @@ MacDockIconHandler::MacDockIconHandler() : QObject()
this->m_dockIconClickEventHandler = [[DockIconClickEventHandler alloc] initWithDockIconHandler:this]; this->m_dockIconClickEventHandler = [[DockIconClickEventHandler alloc] initWithDockIconHandler:this];
this->m_dummyWidget = new QWidget(); this->m_dummyWidget = new QWidget();
this->m_dockMenu = new QMenu(this->m_dummyWidget); this->m_dockMenu = new QMenu(this->m_dummyWidget);
this->setMainWindow(NULL);
[pool release]; [pool release];
} }
@ -113,9 +114,12 @@ MacDockIconHandler *MacDockIconHandler::instance()
} }
void MacDockIconHandler::handleDockIconClickEvent() void MacDockIconHandler::handleDockIconClickEvent()
{
if (this->mainWindow)
{ {
this->mainWindow->activateWindow(); this->mainWindow->activateWindow();
this->mainWindow->show(); this->mainWindow->show();
}
emit this->dockIconClicked(); emit this->dockIconClicked();
} }