-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Release Notes: - [4.6.6](https://github.com/martinrotter/rssguard/releases/tag/4.6.6) - [4.6.4](https://github.com/martinrotter/rssguard/releases/tag/4.6.4) Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
- Loading branch information
1 parent
07d87f2
commit 4bfa0bd
Showing
7 changed files
with
237 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
librssguard.so | ||
rssguard |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
packages/r/rssguard/files/upstream-fix-notification-crash.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
From 3b19a66dd4dbdd4408ea8e6afe9707c0d652df37 Mon Sep 17 00:00:00 2001 | ||
From: Martin Rotter <rotter.martinos@gmail.com> | ||
Date: Fri, 15 Mar 2024 13:18:44 +0100 | ||
Subject: [PATCH] fix for #1317 | ||
|
||
--- | ||
.../gui/settings/settingsnotifications.cpp | 16 ++++++++++------ | ||
1 file changed, 10 insertions(+), 6 deletions(-) | ||
|
||
diff --git a/src/librssguard/gui/settings/settingsnotifications.cpp b/src/librssguard/gui/settings/settingsnotifications.cpp | ||
index a4a50568b..95f24f194 100644 | ||
--- a/src/librssguard/gui/settings/settingsnotifications.cpp | ||
+++ b/src/librssguard/gui/settings/settingsnotifications.cpp | ||
@@ -99,12 +99,16 @@ void SettingsNotifications::saveSettings() { | ||
m_ui.m_cbCustomNotificationsPosition->currentData() | ||
.value<ToastNotificationsManager::NotificationPosition>()); | ||
|
||
- qApp->toastNotifications()->resetNotifications(true); | ||
- qApp->toastNotifications()->showNotification(Notification::Event::GeneralEvent, | ||
- GuiMessage(tr("How do I look?"), | ||
- tr("Just testing new notifications settings. " | ||
- "That's all."), | ||
- QSystemTrayIcon::MessageIcon::Warning)); | ||
+ auto* toasts = qApp->toastNotifications(); | ||
+ | ||
+ if (toasts != nullptr) { | ||
+ toasts->resetNotifications(true); | ||
+ toasts->showNotification(Notification::Event::GeneralEvent, | ||
+ GuiMessage(tr("How do I look?"), | ||
+ tr("Just testing new notifications settings. " | ||
+ "That's all."), | ||
+ QSystemTrayIcon::MessageIcon::Warning)); | ||
+ } | ||
|
||
onEndSaveSettings(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters