aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-05-19 12:07:38 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-05-19 12:07:38 +0300
commit5ed1e236bc0db0f1480344d0934cbb42df20df7b (patch)
treed242fecf6d74a1af7b00760c1fd23a62fddda1c0 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
parentdb94be7a673886297f5a6dfe4331793452a9f609 (diff)
parent1d2d515c91a78a8a3e373e05ae925ba6af1f32fd (diff)
downloadTango-5ed1e236bc0db0f1480344d0934cbb42df20df7b.tar.gz
Tango-5ed1e236bc0db0f1480344d0934cbb42df20df7b.zip
merge, no change
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs2
1 files changed, 2 insertions, 0 deletions
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 72e43d7b0..ab5d2ebb1 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
@@ -405,6 +405,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
/// <param name="data">The data.</param>
private void PopulateDiagnosticsData(StartDiagnosticsResponse data)
{
+ if (data.Monitors == null) return;
+
TimeSpan delta_base = DateTime.Now - _start_time;
TimeSpan delta = (DateTime.Now - _last_time);
double delta_mili = delta.TotalMilliseconds;