fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-04-04 22:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix recursive static init (#2196)

Browse Source 
* Removed default config for abstract logger that sends a system notification, also cleaned up a useless ifdef

* Send notifications from event loop on Win and Mac (#2197)

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

Co-authored-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
borgmanJeremy
2021-12-28 08:43:17 -06:00
committed by GitHub
parent 06eb7acdd3
commit fcadc02a29
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/controller.cpp
View File

@@ -519,12 +519,10 @@ void Controller::enableTrayIcon()
void Controller::disableTrayIcon()
{
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) || defined(Q_OS_MACOS)
if (m_trayIcon) {
m_trayIcon->hide();
}
ConfigHandler().setDisabledTrayIcon(true);
#endif
}
void Controller::sendTrayNotification(const QString& text,

9
src/utils/systemnotification.cpp
View File

@@ -40,7 +40,14 @@ void SystemNotification::sendMessage(const QString& text,
}
#if defined(Q_OS_MACOS) || defined(Q_OS_WIN)
Controller::getInstance()->sendTrayNotification(text, title, timeout);
QMetaObject::invokeMethod(
this,
[&]() {
// The call is queued to avoid recursive static initialization of
// Controller and ConfigHandler.
Controller::getInstance()->sendTrayNotification(text, title, timeout);
},
Qt::QueuedConnection);
#else
QList<QVariant> args;
QVariantMap hintsMap;