1 files changed, 9 insertions, 4 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 a030cf885..41886357b 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
@@ -55,18 +55,18 @@ namespace Tango.MachineStudio.Developer.Views
 
         private void _jobBrushTimer_Tick(object sender, EventArgs e)
         {
-            if (_vm != null && _vm.SelectedJob != null)
+            if (_vm != null && _vm.ActiveJob != null)
             {
                 List<Segment> segments = new List<Segment>();
-                foreach (var s in _vm.SelectedJob.Segments)
+                foreach (var s in _vm.ActiveJob.Segments)
                 {
                     segments.Add(s);
 
-                    if (_vm.SelectedJob.EnableInterSegment && _vm.SelectedJob.Segments.IndexOf(s) != _vm.SelectedJob.Segments.Count - 1)
+                    if (_vm.ActiveJob.EnableInterSegment && _vm.ActiveJob.Segments.IndexOf(s) != _vm.ActiveJob.Segments.Count - 1)
                     {
                         segments.Add(new Segment()
                         {
-                            Length = _vm.SelectedJob.InterSegmentLength,
+                            Length = _vm.ActiveJob.InterSegmentLength,
                             BrushStops = new System.Collections.ObjectModel.ObservableCollection<BrushStop>()
                             {
                                 new BrushStop()
@@ -136,5 +136,10 @@ namespace Tango.MachineStudio.Developer.Views
         {
             e.Handled = true;
         }
+
+        private void OnSegmentDrop(object sender, DropEventArgs e)
+        {
+            _vm.OnDropSegment(e.Draggable.DataContext as Segment, e.Droppable.DataContext as Segment);
+        }
     }
 }