1 files changed, 5 insertions, 4 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index fd37ca8c0..d7851544c 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -65,7 +65,7 @@ namespace Tango.Integration.Operation
         {
             DeviceInformation = new DeviceInformation();
             MachineEventsStateProvider = new DefaultMachineEventsStateProvider();
-            EnableEmbeddedDebugging = true;
+            EnableEmbeddedDebugging = false;
             LogEmbeddedDebuggingToFile = true;
         }
 
@@ -155,6 +155,7 @@ namespace Tango.Integration.Operation
                 OnMachineStatusChanged(value);
                 RaisePropertyChanged(nameof(IsPrinting));
                 RaisePropertyChanged(nameof(CanPrint));
+                LogManager.Log("Machine operator status changed: " + _status);
             }
         }
 
@@ -343,7 +344,7 @@ namespace Tango.Integration.Operation
 
                 LogRequestSent(request);
             }
-            else
+            else if (_diagnosticsSent)
             {
                 _diagnosticsSent = false;
 
@@ -407,7 +408,7 @@ namespace Tango.Integration.Operation
 
                 LogRequestSent(request);
             }
-            else
+            else if (_debugSent)
             {
                 _debugSent = false;
 
@@ -793,7 +794,7 @@ namespace Tango.Integration.Operation
                    {
                        if (!handler.IsCanceled)
                        {
-                           Status = MachineStatuses.Error;
+                           Status = MachineStatuses.ReadyToDye;
                            PrintingFailed?.Invoke(this, new PrintingFailedEventArgs(handler, originalJob, ex));
                            handler.RaiseFailed(ex);
                            LogRequestFailed(request, ex);