Merge pull request #517 from PepperDash/hotfix/zoom-auto-layout

Fix some issues with Zoom Rooms

PepperDashEssentials/ControlSystem.cs

@@ -536,23 +536,31 @@ namespace PepperDash.Essentials
             string logoLight = null;
             string logo = null;
 
-            if (c.Properties["logoDark"] != null)
+            try
             {
-                logoDark = c.Properties["logoDark"].Value<string>("type");
-            }
+                if (c.Properties["logoDark"] != null)
+                {
+                    logoDark = c.Properties["logoDark"].Value<string>("type");
+                }
 
-            if (c.Properties["logoLight"] != null)
+                if (c.Properties["logoLight"] != null)
+                {
+                    logoLight = c.Properties["logoLight"].Value<string>("type");
+                }
+
+                if (c.Properties["logo"] != null)
+                {
+                    logo = c.Properties["logo"].Value<string>("type");
+                }
+
+                return ((logoDark != null && logoDark == "system") ||
+                        (logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
+            }
+            catch (Exception e)
             {
-                logoLight = c.Properties["logoLight"].Value<string>("type");
+                Debug.Console(1, Debug.ErrorLogLevel.Notice, "Unable to find logo information in any room config");
+                return false;
             }
-
-            if (c.Properties["logo"] != null)
-            {
-                logo = c.Properties["logo"].Value<string>("type");
-            }
-
-            return ((logoDark != null && logoDark == "system") ||
-                    (logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
         }
     }
 }

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs

@@ -96,7 +96,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             Audio = new zConfiguration.Audio();
             Video = new zConfiguration.Video();
             Client = new zConfiguration.Client();
-            Camera = new zConfiguration.Camera();
+            Camera = new zConfiguration.Camera();
         }
     }