From 6b065acdae421b71e657a3199d0365988ddd47e0 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Wed, 29 Mar 2023 10:15:33 +0200 Subject: [PATCH] utils: fix desktopNotify --- src/utils/Utils.cpp | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index 1876dfc..137b6c0 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -494,29 +494,30 @@ void externalLinkWarning(QWidget *parent, const QString &url){ } void desktopNotify(const QString &title, const QString &message, int duration) { - if (!Config::hideNotifications) - { - QStringList notify_send = QStringList() << title << message << "-t" << QString::number(duration); - QStringList kdialog = QStringList() << title << message; - QStringList macos = QStringList() << "-e" << QString(R"(display notification "%1" with title "%2")").arg(message).arg(title); - #if defined(Q_OS_LINUX) - QProcess process; - if (fileExists("/usr/bin/kdialog")) - process.start("/usr/bin/kdialog", kdialog); - else if (fileExists("/usr/bin/notify-send")) - process.start("/usr/bin/notify-send", notify_send); - process.waitForFinished(-1); - QString stdout = process.readAllStandardOutput(); - QString stderr = process.readAllStandardError(); - #elif defined(Q_OS_MACOS) - QProcess process; - // @TODO: need to escape special chars with "\" - process.start("osascript", macos); - process.waitForFinished(-1); - QString stdout = process.readAllStandardOutput(); - QString stderr = process.readAllStandardError(); - #endif + if (config()->get(Config::hideNotifications).toBool()) { + return; } + + QStringList notify_send = QStringList() << title << message << "-t" << QString::number(duration); + QStringList kdialog = QStringList() << title << message; + QStringList macos = QStringList() << "-e" << QString(R"(display notification "%1" with title "%2")").arg(message).arg(title); +#if defined(Q_OS_LINUX) + QProcess process; + if (fileExists("/usr/bin/kdialog")) + process.start("/usr/bin/kdialog", kdialog); + else if (fileExists("/usr/bin/notify-send")) + process.start("/usr/bin/notify-send", notify_send); + process.waitForFinished(-1); + QString stdout = process.readAllStandardOutput(); + QString stderr = process.readAllStandardError(); +#elif defined(Q_OS_MACOS) + QProcess process; + // @TODO: need to escape special chars with "\" + process.start("osascript", macos); + process.waitForFinished(-1); + QString stdout = process.readAllStandardOutput(); + QString stderr = process.readAllStandardError(); +#endif } QString displayAddress(const QString& address, int sections, const QString& sep) {