diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-07-16 09:29:44 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-07-16 09:29:44 +0300 |
| commit | beed152bc9c9c004991b414613fef17e06737962 (patch) | |
| tree | 0aac90d453d846b6b1f2195f7211a3dc07280e8d /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer | |
| parent | 230606f80543e12f04f7ca674a208de9d78ad3a1 (diff) | |
| parent | d376387fa28a2091a21e2fc7193812d1f8a40ef2 (diff) | |
| download | Tango-beed152bc9c9c004991b414613fef17e06737962.tar.gz Tango-beed152bc9c9c004991b414613fef17e06737962.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs index 4212c6908..93ede05c3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobProgressToPositionConverter.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows; using System.Windows.Data; using Tango.BL.Entities; @@ -15,7 +16,7 @@ namespace Tango.MachineStudio.Developer.Converters { try { - if (values.Length == 3) + if (values.Length == 3 && values[1] != DependencyProperty.UnsetValue) { double length = System.Convert.ToDouble(values[0]); double progress = System.Convert.ToDouble(values[1]); |