From 1cf4039315b9465693fac2055dee9c4a8f5e9bad Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 19 Oct 2023 16:55:36 -0600 Subject: [PATCH] Adds logic to only instantiate screensaver if mobile control is enabled on room --- .../UI/EssentialsTouchpanelController.cs | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/PepperDashEssentials/UI/EssentialsTouchpanelController.cs b/PepperDashEssentials/UI/EssentialsTouchpanelController.cs index 67f25f42..456a1205 100644 --- a/PepperDashEssentials/UI/EssentialsTouchpanelController.cs +++ b/PepperDashEssentials/UI/EssentialsTouchpanelController.cs @@ -48,10 +48,8 @@ namespace PepperDash.Essentials // spin up different room drivers depending on room type var room = DeviceManager.GetDeviceForKey(roomKey); if (room is IEssentialsHuddleSpaceRoom) - { - // Screen Saver Driver - - mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config); + { + SetupScreenSaver(room, mainDriver); // Header Driver Debug.Console(0, this, "Adding header driver"); @@ -94,10 +92,9 @@ namespace PepperDash.Essentials } else if (room is IEssentialsHuddleVtc1Room) { - Debug.Console(0, this, "Adding huddle space VTC AV driver"); - - // Screen Saver Driver - mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config); + Debug.Console(0, this, "Adding huddle space VTC AV driver"); + + SetupScreenSaver(room, mainDriver); // Header Driver mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, _config); @@ -148,6 +145,16 @@ namespace PepperDash.Essentials Debug.Console(0, this, "ERROR: Cannot load AvFunctionsDriver for room '{0}'", roomKey); } + } + + private void SetupScreenSaver(IKeyed room, EssentialsPanelMainInterfaceDriver mainDriver) + { + var huddleRoom = room as IEssentialsRoom; + // Screen Saver Driver + if (huddleRoom.IsMobileControlEnabled) + { + mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config); + } } public void LoadAndShowDriver(PanelDriverBase driver)