Fix 'force' parameter for notifications.

diff --git a/lib/icinga/service-notification.cpp b/lib/icinga/service-notification.cpp
index ba97c02ea5f60c5a72e16d622bf1ad9bd279e164..0ad7a2bed191db171e37e6be039bdc41c0f35068 100644 (file)
--- a/lib/icinga/service-notification.cpp
+++ b/lib/icinga/service-notification.cpp
@@ -48,15 +48,14 @@ void Service::ResetNotificationNumbers(void)
 
 void Service::SendNotifications(NotificationType type, const Dictionary::Ptr& cr, const String& author, const String& text)
 {
-       bool force = false;
+       bool force = GetForceNextNotification();
 
        if (!GetEnableNotifications()) {
-               if (!GetForceNextNotification()) {
+               if (!force) {
                        Log(LogInformation, "icinga", "Notifications are disabled for service '" + GetName() + "'.");
                        return;
                }
 
-               force = true;
                SetForceNextNotification(false);
        }