Adds logic to only instantiate screensaver if mobile control is enabled on room

PepperDashEssentials/ControlSystem.cs

@@ -337,19 +337,20 @@ namespace PepperDash.Essentials
 		void Load()
 		{
 			LoadDevices();
-			LoadTieLines();
 			LoadRooms();
 			LoadLogoServer();
 
 			DeviceManager.ActivateAll();
 
+            LoadTieLines();
+
 		    var mobileControl = GetMobileControlDevice();
 
 		    if (mobileControl == null) return;
 
             mobileControl.LinkSystemMonitorToAppServer();
 
-		}
+        }
 
         /// <summary>
         /// Reads all devices from config and adds them to DeviceManager

PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs

@@ -334,7 +334,7 @@ namespace PepperDash.Essentials
 		/// route or commands
 		/// </summary>
 		/// <param name="name"></param>
-		public void RunRouteAction(string routeKey, Action successCallback)
+		public virtual void RunRouteAction(string routeKey, Action successCallback)
 		{
 			// Run this on a separate thread
 			new CTimer(o =>

PepperDashEssentials/UI/EssentialsTouchpanelController.cs

@@ -49,9 +49,7 @@ namespace PepperDash.Essentials
             var room = DeviceManager.GetDeviceForKey(roomKey);
             if (room is IEssentialsHuddleSpaceRoom)
             {
-                // Screen Saver Driver
+                SetupScreenSaver(room, mainDriver);
-
-                mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config);
 
                 // Header Driver
                 Debug.Console(0, this, "Adding header driver");
@@ -96,8 +94,7 @@ namespace PepperDash.Essentials
             {
                 Debug.Console(0, this, "Adding huddle space VTC AV driver");
 
-                // Screen Saver Driver
+                SetupScreenSaver(room, mainDriver);
-                mainDriver.ScreenSaverController = new ScreenSaverController(mainDriver, _config);
 
                 // Header Driver
                 mainDriver.HeaderDriver = new EssentialsHeaderDriver(mainDriver, _config);
@@ -150,6 +147,16 @@ namespace PepperDash.Essentials
 
         }
 
+        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)
 		{
             if (PanelDriver != null)