aboutsummaryrefslogtreecommitdiff
path: root/src/qt/bitcoingui.cpp
diff options
context:
space:
mode:
authorJonas Schnelli <jonasschnelli@Jonass-MacBook-Pro.local>2013-04-14 22:11:55 +0200
committerJonas Schnelli <jonas.schnelli@include7.ch>2013-04-15 12:02:01 +0200
commit4d17a1b0c29e8fd8510c75db1efb203b9b4f9eb0 (patch)
tree927cce25f832d04b6ff229d91c4da5bed63437c9 /src/qt/bitcoingui.cpp
parent463a58ae75c817a1f81d439167d1ec9229263312 (diff)
downloadbitcoin-4d17a1b0c29e8fd8510c75db1efb203b9b4f9eb0.tar.xz
fix: GUI Disappearing #1522 (Mac OSX)
- this solution works stable on mac and ensures that the window get's reopened when the user clicks the dock icon . - tested on 10.8 with Qt4.8.4 and Qt5.0.1 Signed-off-by: Jonas Schnelli <jonas.schnelli@include7.ch>
Diffstat (limited to 'src/qt/bitcoingui.cpp')
-rw-r--r--src/qt/bitcoingui.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 14d738d9da..f6ea945c79 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -155,6 +155,7 @@ BitcoinGUI::~BitcoinGUI()
trayIcon->hide();
#ifdef Q_OS_MAC
delete appMenuBar;
+ MacDockIconHandler::instance()->setMainWindow(NULL);
#endif
}
@@ -382,6 +383,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