diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-05-14 11:30:31 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-05-14 11:30:31 +0300 |
| commit | b9c6f8c973994933c60cf0fa06a4bafeb9d349b1 (patch) | |
| tree | 1e4d391ade1ce8ea1fa7dc886477e6d19b2eb3b4 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | |
| parent | b4eded222b78d19ea2e1606ee1a7f457c0aa1738 (diff) | |
| parent | d7530fe9e5c7e95c59966fd548200cb1e80ff07b (diff) | |
| download | Tango-b9c6f8c973994933c60cf0fa06a4bafeb9d349b1.tar.gz Tango-b9c6f8c973994933c60cf0fa06a4bafeb9d349b1.zip | |
commit after conflict
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; |