Fix $ido_name$ macro when using the IDO check type with command_endpoint

fixes #12428

diff --git a/lib/db_ido/idochecktask.cpp b/lib/db_ido/idochecktask.cpp
index bcab7aa89dba09d691236af1b1b5cf129dc2fe33..049928e4f6926560075f0e00afb01d3c4cacdc5c 100644 (file)
--- a/lib/db_ido/idochecktask.cpp
+++ b/lib/db_ido/idochecktask.cpp
@@ -55,6 +55,9 @@ void IdoCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult
        String idoType = MacroProcessor::ResolveMacros("$ido_type$", resolvers, checkable->GetLastCheckResult(),
            NULL, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros);
 
+       String idoName = MacroProcessor::ResolveMacros("$ido_name$", resolvers, checkable->GetLastCheckResult(),
+           NULL, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros);
+
        if (resolvedMacros && !useResolvedMacros)
                return;
 
@@ -65,12 +68,6 @@ void IdoCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult
                return;
        }
 
-       String idoName = MacroProcessor::ResolveMacros("$ido_name$", resolvers, checkable->GetLastCheckResult(),
-           NULL, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros);
-
-       if (resolvedMacros && !useResolvedMacros)
-               return;
-
        if (idoName.IsEmpty()) {
                cr->SetOutput("Macro 'ido_name' must be set.");
                cr->SetState(ServiceUnknown);