diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-28 18:48:03 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-28 18:48:03 +0300 |
| commit | 323a408ed2059dbaa86150967544e82433b3d04e (patch) | |
| tree | ec13b2e7fd805017b434701674df6b75b6ea76c3 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs | |
| parent | 952e9ccbb94aabd0c3d0857f6d454d90e1afcf91 (diff) | |
| parent | 33a2d098936cad4e7a8ca0c16187023a78fc4e43 (diff) | |
| download | Tango-323a408ed2059dbaa86150967544e82433b3d04e.tar.gz Tango-323a408ed2059dbaa86150967544e82433b3d04e.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 | 8 |
1 files changed, 8 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 9ecfa2312..a186d3039 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 @@ -975,6 +975,10 @@ namespace Tango.MachineStudio.Technician.ViewModels } catch (Exception ex) { + item.IsHomingCompleted = true; + item.IsHoming = false; + item.HomingProgress = 0; + item.HomingMaximumProgress = 0; LogManager.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName)); _eventLogger.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName)); } @@ -1062,6 +1066,10 @@ namespace Tango.MachineStudio.Technician.ViewModels } catch (Exception ex) { + item.IsHomingCompleted = true; + item.IsHoming = false; + item.HomingProgress = 0; + item.HomingMaximumProgress = 0; LogManager.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName)); _eventLogger.Log(ex, String.Format("Error executing technician command '{0}' on item '{1}'.", action, item.TechName)); } |