Check if flapping is enabled.

diff --git a/lib/icinga/service-flapping.cpp b/lib/icinga/service-flapping.cpp
index 56f7239c7a226680bda39f1c388e3758c74896aa..276e97730b67cf6044683044c7a87794ebcad756 100644 (file)
--- a/lib/icinga/service-flapping.cpp
+++ b/lib/icinga/service-flapping.cpp
@@ -110,5 +110,8 @@ void Service::UpdateFlappingStatus(bool stateChange)
 
 bool Service::IsFlapping(void) const
 {
-       return GetFlappingCurrent() > GetFlappingThreshold();
+       if (!GetEnableFlapping())
+               return false;
+       else
+               return GetFlappingCurrent() > GetFlappingThreshold();
 }