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-12 18:25:31 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-05-12 18:25:31 +0300
commitee213ec69a6c9c861f105d0bfa511d39dddab96b (patch)
treeb1a8780d643b7233abb269c8ed63673efb8f8607 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
parentce0fe045c8dc0f005c4e70da5e71729d0c986165 (diff)
parentabb9a44c342b47a962ae330ed520c0df15028a00 (diff)
downloadTango-ee213ec69a6c9c861f105d0bfa511d39dddab96b.tar.gz
Tango-ee213ec69a6c9c861f105d0bfa511d39dddab96b.zip
merge
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;