1 files changed, 6 insertions, 4 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index c5841a8b5..92fc9cc1c 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -2884,12 +2884,12 @@ namespace Tango.Integration.Operation
                                 await fileUploadHandler.Cancel();
                                 fileUploadHandler = null;
                                 LogManager.Log("Job upload canceled.");
-                                OnPrintingAborted(handler, jobForJobRun);
-                                handler.RaiseCanceled();
                                 if (Status != MachineStatuses.Disconnected)
                                 {
                                     UpdateStatus(MachineStatuses.ReadyToDye);
                                 }
+                                OnPrintingAborted(handler, jobForJobRun);
+                                handler.RaiseCanceled();
                             }
                             else
                             {
@@ -2899,12 +2899,14 @@ namespace Tango.Integration.Operation
                                 }
 
                                 SaveLastJobLiquidQuantities(clonedJob, originalJob.Machine.Configuration, processParameters, handler);
-                                OnPrintingAborted(handler, jobForJobRun);
-                                handler.RaiseCanceled();
+
                                 if (Status != MachineStatuses.Disconnected)
                                 {
                                     UpdateStatus(MachineStatuses.ReadyToDye);
                                 }
+
+                                OnPrintingAborted(handler, jobForJobRun);
+                                handler.RaiseCanceled();
                             }
                         }
                     }