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

1 files changed, 10 insertions, 3 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 a18d0c6c6..f9bffae29 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -575,13 +575,20 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// <param name="machineEvent">The HTML page.</param>
         private async void ResolveMachineEvent(MachinesEvent machineEvent)
         {
-            if (_htmlPresenter.DisplayHtml(machineEvent.EventType.HtmlPage))
+            if (machineEvent.EventType.HtmlPage != null)
             {
-                if (ApplicationManager.ConnectedMachine != null)
+                if (_htmlPresenter.DisplayHtml(machineEvent.EventType.HtmlPage))
                 {
-                    await ApplicationManager.ConnectedMachine.ResolveEvent((PMR.Diagnostics.EventType)machineEvent.Type);
+                    if (ApplicationManager.ConnectedMachine != null && machineEvent.EventType.Resolvable)
+                    {
+                        await ApplicationManager.ConnectedMachine.ResolveEvent((PMR.Diagnostics.EventType)machineEvent.Type);
+                    }
                 }
             }
+            else
+            {
+                _notificationProvider.ShowWarning("Could not locate guidance content for the specified event.");
+            }
         }
     }
 }