fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-01-06 00:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a few additional check on initializing trayMenu, possibly they will fix rare issue with frozen application on MacOS

Browse Source 
(cherry picked from commit bf5741a9145659e9fc5489f26a62c9757b824abe)
This commit is contained in:
Yuriy Puchkov
2021-02-06 12:47:26 +02:00
parent ecb88380a6
commit 1ad6f9ff74
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/controller.cpp
View File

@@ -58,6 +58,7 @@
Controller::Controller()
: m_captureWindow(nullptr)
, m_history(nullptr)
, m_trayIcon(nullptr)
, m_trayIconMenu(nullptr)
, m_networkCheckUpdates(nullptr)
, m_showCheckAppUpdateStatus(false)
@@ -369,7 +370,10 @@ void Controller::enableTrayIcon()
if (m_trayIcon) {
return;
}
m_trayIconMenu = new QMenu();
if (nullptr == m_trayIconMenu) {
m_trayIconMenu = new QMenu();
Q_ASSERT(m_trayIconMenu);
}
ConfigHandler().setDisabledTrayIcon(false);
QAction* captureAction = new QAction(tr("&Take Screenshot"), this);
@@ -425,7 +429,10 @@ void Controller::enableTrayIcon()
m_trayIconMenu->addAction(quitAction);
setCheckForUpdatesEnabled(ConfigHandler().checkForUpdates());
m_trayIcon = new QSystemTrayIcon();
if (nullptr == m_trayIcon) {
m_trayIcon = new QSystemTrayIcon();
Q_ASSERT(m_trayIcon);
}
m_trayIcon->setToolTip(QStringLiteral("Flameshot"));
#if defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX)
@@ -439,9 +446,9 @@ void Controller::enableTrayIcon()
#else
m_trayIcon->setContextMenu(m_trayIconMenu);
#endif
QIcon trayicon =
QIcon trayIcon =
QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png"));
m_trayIcon->setIcon(trayicon);
m_trayIcon->setIcon(trayIcon);
#if defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX)