aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-05-12 16:22:55 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-05-12 16:22:55 +0300
commit7ef2f5156e8a7958ee6425f53158f94974762ef9 (patch)
tree071a0b745c47dafbddb705e38486956a5c0f2720 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
parent524bc43f07339979eda1c812354a9a2e8e0f7e09 (diff)
downloadTango-7ef2f5156e8a7958ee6425f53158f94974762ef9.tar.gz
Tango-7ef2f5156e8a7958ee6425f53158f94974762ef9.zip
Fixed CircleActionButton on TCC.
Prevent continues messages from updating after complete or error. Fixed diagnostics not resuming MS <=> PPC after PPC <=> Machine disconnection.
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;