From d9c93e01396478f074ea5676496491ac04a0a421 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Tue, 25 Jun 2024 12:19:13 -0600 Subject: [PATCH] feat: Adds cameraLists to config merge method --- src/Pepperdash Core/Config/PortalConfigReader.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Pepperdash Core/Config/PortalConfigReader.cs b/src/Pepperdash Core/Config/PortalConfigReader.cs index ac50930..59a8164 100644 --- a/src/Pepperdash Core/Config/PortalConfigReader.cs +++ b/src/Pepperdash Core/Config/PortalConfigReader.cs @@ -98,12 +98,19 @@ public static JObject MergeConfigs(JObject doubleConfig) merged.Add("destinationLists", Merge(template["destinationLists"], system["destinationLists"], "destinationLists")); + + if (system["cameraLists"] == null) + merged.Add("cameraLists", template["cameraLists"]); + else + merged.Add("cameraLists", Merge(template["cameraLists"], system["cameraLists"], "cameraLists")); + if (system["audioControlPointLists"] == null) merged.Add("audioControlPointLists", template["audioControlPointLists"]); else merged.Add("audioControlPointLists", Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists")); + // Template tie lines take precedence. Config tool doesn't do them at system // level anyway... if (template["tieLines"] != null)