1 files changed, 18 insertions, 3 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 86748d2f0..4cf14a216 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
@@ -666,6 +666,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
             _jobHandler.Cancel();
         }
 
+        private void FailJob()
+        {
+            IsJobRunning = false;
+            IsJobFailed = true;
+        }
+
         private void CompleteJob()
         {
             IsJobRunning = false;
@@ -693,19 +699,28 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
             _jobHandler = MachineOperator.Print(SelectedJob, SelectedProcessParametersTable);
 
-            _jobHandler.StatusReceived += (x, status) => 
+            _jobHandler.StatusReceived += (x, status) =>
             {
                 RunningJobRemainingTime = _runningJobEstimatedDuration - TimeSpan.FromSeconds(RunningJobProgress / (SelectedProcessParametersTable.DyeingSpeed / 100d));
                 RunningJobProgress = status.Progress;
             };
 
+            _jobHandler.Failed += (x, ex) =>
+            {
+                FailJob();
+
+                InvokeUI(() =>
+                {
+                    _notification.ShowError("Job failed. " + ex.Message);
+                });
+            };
 
-            _jobHandler.Completed += (x, e) => 
+            _jobHandler.Completed += (x, e) =>
             {
                 CompleteJob();
             };
 
-            _jobHandler.Canceled += (x, y) => 
+            _jobHandler.Canceled += (x, y) =>
             {
                 //Finally Canceled..
             };