1 files changed, 18 insertions, 32 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 93baf3b9d..63cfa10b8 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
@@ -873,7 +873,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                         foreach (var stop in stops)
                         {
-                            if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32() && !stop.IsLiquidVolumesOutOfRange)
+                            if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32())
                             {
                                 try
                                 {
@@ -1479,39 +1479,15 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 JobHandler.Failed += (x, ex) =>
                 {
-                    if (ex is InsufficientLiquidQuantityException)
-                    {
-                        InvokeUI(() =>
-                        {
-                            _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex as InsufficientLiquidQuantityException), (_) =>
-                            {
-
-                                MachineOperator.EnableJobLiquidQuantityValidation = false;
-                                StartJob();
-
-                            }, () =>
-                            {
-                                SetJobFailed();
+                    LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
+                    _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
+                    SetJobFailed();
 
-                                InvokeUI(() =>
-                                {
-                                    StopRecordingIfInProgress();
-                                });
-                            });
-                        });
-                    }
-                    else
+                    InvokeUI(() =>
                     {
-                        LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                        _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                        SetJobFailed();
-
-                        InvokeUI(() =>
-                        {
-                            _notification.ShowError("Job failed. " + ex.FlattenMessage());
-                            StopRecordingIfInProgress();
-                        });
-                    }
+                        _notification.ShowError("Job failed. " + ex.FlattenMessage());
+                        StopRecordingIfInProgress();
+                    });
                 };
 
                 JobHandler.Finalizing += (_, __) =>
@@ -1543,6 +1519,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     //Finally Canceled..
                 };
             }
+            catch (InsufficientLiquidQuantityException ex)
+            {
+                _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex), (x) =>
+                {
+
+                    MachineOperator.EnableJobLiquidQuantityValidation = false;
+                    StartJob();
+
+                }, () => { });
+            }
             catch (Exception ex)
             {
                 LogManager.Log(ex);