diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-27 02:15:54 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-04-27 02:15:54 -0700 |
| commit | 63888d43bee33ec2f234894dc52fbd4b4f4710b8 (patch) | |
| tree | c1f8a0934ed73d3fad98db4b444c5ffc7c48d82d /src/qt/bitcoingui.cpp | |
| parent | 6e40d7986038e4c5d5b293637bc27496ad0aa3d0 (diff) | |
| parent | 4d17a1b0c29e8fd8510c75db1efb203b9b4f9eb0 (diff) | |
| download | bitcoin-63888d43bee33ec2f234894dc52fbd4b4f4710b8.tar.xz | |
Merge pull request #2530 from jonasschnelli/mac_win_reopen_fix
fixes #1522: GUI Disappearing (Mac OSX)
Diffstat (limited to 'src/qt/bitcoingui.cpp')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 71db587e04..78a69af8b0 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -153,6 +153,7 @@ BitcoinGUI::~BitcoinGUI() trayIcon->hide(); #ifdef Q_OS_MAC delete appMenuBar; + MacDockIconHandler::instance()->setMainWindow(NULL); #endif } @@ -380,6 +381,7 @@ void BitcoinGUI::createTrayIconMenu() #else // Note: On Mac, the dock icon is used to provide the tray's functionality. MacDockIconHandler *dockIconHandler = MacDockIconHandler::instance(); + dockIconHandler->setMainWindow((QMainWindow *)this); trayIconMenu = dockIconHandler->dockMenu(); #endif |