Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 10 insertions, 15 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 81719287b..c9f4b3441 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -238,8 +238,6 @@ namespace Tango.MachineStudio.UI.ViewModels
             ApplicationManager = applicationManager;
             DiagnosticsFrameProvider = frameProvider;
 
-            DiagnosticsFrameProvider.MachineEventsStateProviderChanged += FrameProvider_MachineEventsStateProviderChanged;
-
             StartModuleCommand = new RelayCommand<IStudioModule>(StartModule);
 
             HomeCommand = new RelayCommand(Home);
@@ -253,26 +251,23 @@ namespace Tango.MachineStudio.UI.ViewModels
             _updateCheckThread = new Thread(UpdateCheckThreadMethod);
             _updateCheckThread.IsBackground = true;
             _updateCheckThread.Start();
-        }
 
-        private void FrameProvider_MachineEventsStateProviderChanged(object sender, Integration.Operation.IMachineEventsStateProvider provider)
-        {
-
-            if (DiagnosticsFrameProvider.MachineEventsStateProvider.Events.Count == 0)
+            ApplicationManager.ConnectedMachineChanged += (sender, machine) =>
             {
-                IsMachineErrorsOpened = false;
-            }
-
-            provider.NewEvents -= MachineEventsStateProvider_NewEvents;
-            provider.NewEvents += MachineEventsStateProvider_NewEvents;
+                if (machine != null)
+                {
+                    machine.MachineEventsStateProvider.NewEvents -= MachineEventsStateProvider_NewEvents;
+                    machine.MachineEventsStateProvider.NewEvents += MachineEventsStateProvider_NewEvents;
 
-            provider.EventsResolved -= MachineEventsStateProvider_EventsResolved;
-            provider.EventsResolved += MachineEventsStateProvider_EventsResolved;
+                    machine.MachineEventsStateProvider.EventsResolved -= MachineEventsStateProvider_EventsResolved;
+                    machine.MachineEventsStateProvider.EventsResolved += MachineEventsStateProvider_EventsResolved;
+                }
+            };
         }
 
         private void MachineEventsStateProvider_EventsResolved(object sender, IEnumerable<MachinesEvent> e)
         {
-            if (DiagnosticsFrameProvider.MachineEventsStateProvider.Events.Count == 0)
+            if (ApplicationManager.ConnectedMachine.MachineEventsStateProvider.Events.Count == 0)
             {
                 IsMachineErrorsOpened = false;
             }