Fixed several issues with PPC.

1 files changed, 4 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index f7711318f..788d2b178 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -46,6 +46,7 @@ namespace Tango.PPC.UI.PPCApplication
         private IPPCModuleLoader _moduleLoader;
         private INotificationProvider _notificationProvider;
         private WatchDogServer _watchdogServer;
+        private ObservablesContext _machineContext;
 
         /// <summary>
         /// Occurs when a system restart is required.
@@ -203,7 +204,8 @@ namespace Tango.PPC.UI.PPCApplication
                         LogManager.Log("Initializing ObservablesStaticCollections...");
                         ObservablesStaticCollections.Instance.Initialize();
                         LogManager.Log("Loading machine from database...");
-                        _machine = new MachineBuilder(ObservablesContext.CreateDefault()).SetFirst().WithOrganization().WithConfiguration().WithSpools().Build();
+                        _machineContext = ObservablesContext.CreateDefault();
+                        _machine = new MachineBuilder(_machineContext).SetFirst().WithSettings().WithOrganization().WithConfiguration().WithSpools().WithCats().Build();
                     }
 
                     initialized = true;
@@ -301,7 +303,7 @@ namespace Tango.PPC.UI.PPCApplication
             LogManager.Log("Finalizing application initialization...");
 
             LogManager.Log("Initializing Machine Provider...");
-            _machineProvider.Init(_machine);
+            _machineProvider.Init(_machine, _machineContext);
 
             LogManager.Log("Applications initialization completed!");