From 5968cf5db2a62689a341c02550eeebbf0dabd5ef Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Tue, 19 Mar 2013 23:33:36 +0100 Subject: [PATCH] Bitcoin-Qt: ensure createTrayIconMenu() is always called on Mac - this should prevent GUI issues on Mac that were observed before (disappearing GUI - see #1522) - the patch ensures, that createTrayIconMenu() is always called on Mac to process and use our MacDockIconHandler --- src/qt/bitcoingui.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index eff8e667f..a48581c6a 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -326,8 +326,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) // Create system tray menu (or setup the dock menu) that late to prevent users from calling actions, // while the client has not yet fully loaded - if(trayIcon) - createTrayIconMenu(); + createTrayIconMenu(); // Keep up to date with client setNumConnections(clientModel->getNumConnections()); @@ -375,6 +374,10 @@ void BitcoinGUI::createTrayIconMenu() { QMenu *trayIconMenu; #ifndef Q_OS_MAC + // return if trayIcon is unset (only on non-Mac OSes) + if (!trayIcon) + return; + trayIconMenu = new QMenu(this); trayIcon->setContextMenu(trayIconMenu);