Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 18 insertions, 14 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index 18dc795bd..28e488aae 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -251,7 +251,7 @@ namespace Tango.MachineStudio.Developer.Views
 
         private void BrushPicker_ColorChanged(object sender, BrushPicker.ColorChangedEventArgs e)
         {
-           
+
         }
 
         private void ColorCanvas_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
@@ -284,7 +284,7 @@ namespace Tango.MachineStudio.Developer.Views
 
         private void listBoxSegments_PreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
-            
+
         }
 
         private void listBoxSegments_MouseEnter(object sender, MouseEventArgs e)
@@ -295,22 +295,26 @@ namespace Tango.MachineStudio.Developer.Views
 
         private void OnBrushStopFieldValueChanged(object sender, RoutedPropertyChangedEventArgs<double?> e)
         {
-            BrushStop stop = null;
-            var dataContext = (sender as FrameworkElement).DataContext;
-
-            if (dataContext != null)
+            try
             {
-                if (dataContext is BrushStop)
-                {
-                    stop = dataContext as BrushStop;
-                }
-                else
+                BrushStop stop = null;
+                var dataContext = (sender as FrameworkElement).DataContext;
+
+                if (dataContext != null)
                 {
-                    stop = (dataContext as LiquidVolume).BrushStop;
-                }
+                    if (dataContext is BrushStop)
+                    {
+                        stop = dataContext as BrushStop;
+                    }
+                    else
+                    {
+                        stop = (dataContext as LiquidVolume).BrushStop;
+                    }
 
-                _vm.OnBrushStopFieldValueChanged(stop);
+                    _vm.OnBrushStopFieldValueChanged(stop);
+                }
             }
+            catch { }
         }
 
         private void OnBrushStopMouseDown(object sender, MouseButtonEventArgs e)