From c7e6e0c250961077504aba62efd3708d04f0fc8a Mon Sep 17 00:00:00 2001
From: Andrew Welker <andrew.welker@gmail.com>
Date: Thu, 23 Jul 2020 08:48:05 -0600
Subject: [PATCH] Move some activation steps to PostActivation

---
 ...lsHuddleSpaceFusionSystemControllerBase.cs | 36 ++++++-------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
index de4c444e..594cae83 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
@@ -165,24 +165,19 @@ namespace PepperDash.Essentials.Core.Fusion
                 {
                     // Exists. Read GUIDs
                     ReadGuidFile(guidFilePath);
+                }
+
+                if (Room.RoomOccupancy != null)
+                {
+                    if (Room.OccupancyStatusProviderIsRemote)
+                        SetUpRemoteOccupancy();
+                    else
+                    {
+                        SetUpLocalOccupancy();
+                    }
                 }
 
                 CreateSymbolAndBasicSigs(IpId);
-                SetUpSources();
-                SetUpCommunitcationMonitors();
-                SetUpDisplay();
-                SetUpError();
-                ExecuteCustomSteps();
-
-                if (Room.RoomOccupancy != null)
-                {
-                    if (Room.OccupancyStatusProviderIsRemote)
-                        SetUpRemoteOccupancy();
-                    else
-                    {
-                        SetUpLocalOccupancy();
-                    }
-                }
 
                 AddPostActivationAction(() =>
                 {
@@ -192,17 +187,6 @@ namespace PepperDash.Essentials.Core.Fusion
                     SetUpError();
                     ExecuteCustomSteps();
 
-                    if (Room.RoomOccupancy == null)
-                    {
-                        return;
-                    }
-                    if (Room.OccupancyStatusProviderIsRemote)
-                        SetUpRemoteOccupancy();
-                    else
-                    {
-                        SetUpLocalOccupancy();
-                    }
-
                     FusionRVI.GenerateFileForAllFusionDevices();
 
                     GenerateGuidFile(guidFilePath);