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

1 files changed, 6 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index bdfa8a218..88c753846 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -144,6 +144,11 @@ namespace Tango.Integration.Operation
 
         #region Properties
 
+        /// <summary>
+        /// Gets or sets the job handling mode.
+        /// </summary>
+        public JobHandlerModes JobHandlingMode { get; set; }
+
         private MachineStatuses _status;
         /// <summary>
         /// Gets the current machine status.
@@ -778,7 +783,7 @@ namespace Tango.Integration.Operation
                 {
                     LogManager.Log(ex, "Failed to cancel job.");
                 }
-            }, originalJob, processParameters);
+            }, originalJob, processParameters, JobHandlingMode);
 
             handler.StatusChanged += (x, s) =>
             {