feat: Adds cameraLists to config merge method

PepperDash · Jun 25, 2024 · d9c93e0 · d9c93e0
1 parent 18df4ef
commit d9c93e0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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)