pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-01-11 19:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Adds cameraLists to config merge method

Browse Source
This commit is contained in:
Neil Dorin
2024-06-25 12:19:13 -06:00
parent 18df4ef0b1
commit d9c93e0139
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Pepperdash Core/Config/PortalConfigReader.cs
View File

@@ -98,12 +98,19 @@ namespace PepperDash.Core.Config
merged.Add("destinationLists", merged.Add("destinationLists",
Merge(template["destinationLists"], system["destinationLists"], "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) if (system["audioControlPointLists"] == null)
merged.Add("audioControlPointLists", template["audioControlPointLists"]); merged.Add("audioControlPointLists", template["audioControlPointLists"]);
else else
merged.Add("audioControlPointLists", merged.Add("audioControlPointLists",
Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists")); Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists"));
// Template tie lines take precedence. Config tool doesn't do them at system // Template tie lines take precedence. Config tool doesn't do them at system
// level anyway... // level anyway...
if (template["tieLines"] != null) if (template["tieLines"] != null)