From 8d1933f305e8fb4aa4cc7633fa02c419d77766ff Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 15 Jan 2020 21:13:45 +0200
Subject: External bridge improvements.

---
 .../Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 7cb680527..139d85493 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -459,7 +459,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// <param name="data">The data.</param>
         private void PopulateDiagnosticsData(StartDiagnosticsResponse data)
         {
-            if (data.Monitors == null) return;
+            if (data.Monitors == null || _machineOperator == null || _machineOperator.DeviceInformation == null) return;
 
             _diagnostics_index++;
             uint interval = _machineOperator.DeviceInformation.DiagnosticsInterval;
-- 
cgit v1.3.1