Implemented module popping!

1 files changed, 5 insertions, 2 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 5e8a72378..470d98912 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
@@ -90,7 +90,7 @@ namespace Tango.MachineStudio.Developer.Views
 
         private void UpdateGradientBrushDisplay()
         {
-            if (_vm.SelectedSegment != null)
+            if (_vm != null && _vm.SelectedSegment != null)
             {
                 SegmentToGradientStopsConverter converter = new SegmentToGradientStopsConverter();
                 GradientStopCollection stops = converter.Convert(_vm.SelectedSegment, null, null, null) as GradientStopCollection;
@@ -98,7 +98,10 @@ namespace Tango.MachineStudio.Developer.Views
             }
             else
             {
-                gradientBrush.GradientStops = new GradientStopCollection();
+                if (gradientBrush != null)
+                {
+                    gradientBrush.GradientStops = new GradientStopCollection();
+                }
             }
         }