From 20dab6669b3753fa333f3a09c0aa82bb55eb37db Mon Sep 17 00:00:00 2001
From: Mattia Codato <mattia.codato@wuerth-phoenix.com>
Date: Tue, 30 Jun 2020 13:51:42 +0200
Subject: [PATCH] Unify how to take macros parameter

---
 lib/icinga/apiactions.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/icinga/apiactions.cpp b/lib/icinga/apiactions.cpp
index 835054442..3442950e7 100644
--- a/lib/icinga/apiactions.cpp
+++ b/lib/icinga/apiactions.cpp
@@ -542,8 +542,9 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
 
 	MacroProcessor::ResolverList resolvers;
 	if (params->Contains("macros")) {
-		if (params->Get("macros").IsObjectType<Dictionary>())
-			resolvers.emplace_back("override",HttpUtility::GetLastParameter(params, "macros"));
+		Value macros = HttpUtility::GetLastParameter(params, "macros");
+		if (macros.IsObjectType<Dictionary>())
+			resolvers.emplace_back("override", macros);
 		else
 			return ApiActions::CreateResult(400, "Parameter macros must be a dictionary.");
 	}