From aa258685bea220f1ad2e902eb8ce78a70e3670a3 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Tue, 28 Jan 2020 10:27:02 +0100
Subject: [PATCH] Checkable#next_update: always use #check_interval if
 !#enable_active_checks

---
 lib/icinga/checkable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 3ff54b267..3caf5eace 100644
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -195,7 +195,7 @@ Timestamp Checkable::GetNextUpdate() const
 	double interval, latency;
 
 	if (cr) {
-		interval = GetProblem() && GetStateType() == StateTypeSoft ? GetRetryInterval() : GetCheckInterval();
+		interval = GetEnableActiveChecks() && GetProblem() && GetStateType() == StateTypeSoft ? GetRetryInterval() : GetCheckInterval();
 		latency = cr->GetExecutionEnd() - cr->GetScheduleStart();
 	} else {
 		interval = GetCheckInterval();