diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-16 11:58:10 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-16 11:58:10 +0300 |
| commit | 30fcfa4100a9d00e887c6e17e32e427b05296ce7 (patch) | |
| tree | 0810375ae9424acca748b6538e7d1cf706dbb3a4 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | |
| parent | 62b3546679aab27fc35b0955608c24ad37619258 (diff) | |
| parent | 4fdb3d2406b16a95e15fe24d6f562e666b3258af (diff) | |
| download | Tango-30fcfa4100a9d00e887c6e17e32e427b05296ce7.tar.gz Tango-30fcfa4100a9d00e887c6e17e32e427b05296ce7.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
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.cs | 2 |
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; |