From 834e37d3e25726d4bc62da1ffc54051f4d9b3bfe Mon Sep 17 00:00:00 2001
From: Noah Hilverling <noah@hilverling.com>
Date: Tue, 4 Sep 2018 13:11:28 +0200
Subject: [PATCH] Still notify on acknowledgement and recovery if user does not
 get problem notifications at all

refs #6047
---
 lib/icinga/notification.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
index 85ca54da7..6da7f428f 100644
--- a/lib/icinga/notification.cpp
+++ b/lib/icinga/notification.cpp
@@ -402,7 +402,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
 
 		/* on recovery, check if user was notified before */
 		if (type == NotificationRecovery) {
-			if (!notifiedProblemUsers->Contains(userName)) {
+			if (!notifiedProblemUsers->Contains(userName) && CheckNotificationUserFilters(NotificationProblem, user, false, false)) {
 				Log(LogNotice, "Notification")
 					<< "We did not notify user '" << userName << "' for a problem before. Not sending recovery notification.";
 				continue;
@@ -411,7 +411,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
 
 		/* on acknowledgement, check if user was notified before */
 		if (type == NotificationAcknowledgement) {
-			if (!notifiedProblemUsers->Contains(userName)) {
+			if (!notifiedProblemUsers->Contains(userName) && CheckNotificationUserFilters(NotificationProblem, user, false, false)) {
 				Log(LogNotice, "Notification")
 						<< "We did not notify user '" << userName << "' for a problem before. Not sending acknowledgement notification.";
 				continue;