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

1 files changed, 6 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 04d2fae4b..02431fd98 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -742,7 +742,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             SaveJobCommand = new RelayCommand(SaveActiveJob, () => SelectedMachine != null && CanWork);
             DiscardJobCommand = new RelayCommand(BackToJobs, () => SelectedMachine != null && CanWork);
             StartJobCommand = new RelayCommand(() => StartJob(), () => ActiveJob != null && CanWork && !IsJobRunning && MachineOperator != null);
-            StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null);
+            StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null && CanWork);
             StopJobCommand = new RelayCommand(StopJob, () => IsJobRunning && CanWork);
             CloseJobCompletionStatusCommand = new RelayCommand(CloseJobCompletionStatusBar);
             LoadJobCommand = new RelayCommand(() => LoadSelectedJob(), () => SelectedMachineJob != null && CanWork);
@@ -1332,16 +1332,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
                         _preparingTaskItem = item;
                         JobHandler = await MachineOperator.Print(ActiveJob, SelectedProcessParametersTable);
                     }
-
-                    _navigation.NavigateTo(DeveloperNavigationView.RunningJobView);
-                    IsJobRunning = true;
-                    ShowJobStatus = true;
                 }
                 else
                 {
                     JobHandler = resumeFunc(ActiveJob);
                 }
 
+                _navigation.NavigateTo(DeveloperNavigationView.RunningJobView);
+                IsJobRunning = true;
+                ShowJobStatus = true;
+
                 _eventLogger.Log(String.Format("Job '{0}' started...", ActiveJob.Name));
 
                 JobHandler.StatusChanged += (x, status) =>
@@ -2179,6 +2179,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 var cloned = stop.Clone();
                 cloned.StopIndex = SelectedSegment.BrushStops.Max(x => x.StopIndex) + 1;
+                cloned.SetLiquidVolumes(ActiveJob.Machine.Configuration, SelectedRML, SelectedProcessParametersTable);
                 SelectedSegment.BrushStops.Add(cloned);
             }