From 7c4222a598bb4f324e345d3fbd5c2dc98529c4a1 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 23 Jul 2020 08:30:00 -0600 Subject: [PATCH] move most init actions to PostActivationAction --- ...lsHuddleSpaceFusionSystemControllerBase.cs | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs index 1db09b14..de4c444e 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs @@ -184,10 +184,30 @@ namespace PepperDash.Essentials.Core.Fusion } } - // Make it so! - FusionRVI.GenerateFileForAllFusionDevices(); + AddPostActivationAction(() => + { + SetUpSources(); + SetUpCommunitcationMonitors(); + SetUpDisplay(); + SetUpError(); + ExecuteCustomSteps(); + + if (Room.RoomOccupancy == null) + { + return; + } + if (Room.OccupancyStatusProviderIsRemote) + SetUpRemoteOccupancy(); + else + { + SetUpLocalOccupancy(); + } + + FusionRVI.GenerateFileForAllFusionDevices(); + + GenerateGuidFile(guidFilePath); + }); - GenerateGuidFile(guidFilePath); } catch (Exception e) {