diff options
| author | Mirta <mirta@twine-s.com> | 2019-05-14 14:43:14 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2019-05-14 14:43:14 +0300 |
| commit | d13a20a4ab738e1f96fb94aa192d9b925ad2e164 (patch) | |
| tree | d1c55eafe9facf87cb1ebd7e89dd5a418bdefe98 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | |
| parent | 06b6cec9375af3951117ffec9206c47f354b7ad8 (diff) | |
| parent | 5326f66bf1b6ebd7519087d7811a55d193e8542f (diff) | |
| download | Tango-d13a20a4ab738e1f96fb94aa192d9b925ad2e164.tar.gz Tango-d13a20a4ab738e1f96fb94aa192d9b925ad2e164.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.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; |