Finished last bug fix

Duet3D · Oct 18, 2024 · a8b990e · a8b990e
1 parent 0c1de66
commit a8b990e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/DuetControlServer/Codes/Pipelines/PipelineBase.cs b/src/DuetControlServer/Codes/Pipelines/PipelineBase.cs
@@ -154,9 +154,7 @@ public virtual Task<bool> FlushAsync(CodeFile file)
                         return stackItem.FlushAsync();
                     }
                 }
-
-                Processor.Logger.Warn("Failed to find corresponding state for file flush request, falling back to current state");
-                return CurrentStackItem.FlushAsync();
+                return Task.FromResult(false);
             }
         }
 
@@ -178,9 +176,7 @@ public virtual Task<bool> FlushAsync(Commands.Code code, bool evaluateExpression
                         return stackItem.FlushAsync(code);
                     }
                 }
-
-                Processor.Logger.Warn("Failed to find corresponding state for code flush request, falling back to current state");
-                return CurrentStackItem.FlushAsync(code);
+                return Task.FromResult(false);
             }
         }
 

diff --git a/src/DuetControlServer/SPI/Channel/Processor.cs b/src/DuetControlServer/SPI/Channel/Processor.cs
@@ -604,10 +604,7 @@ public void FilesAborted(bool abortAll)
                 // Invalidate remaining buffered codes from the last macro file
                 foreach (Code bufferedCode in BufferedCodes)
                 {
-                    if (bufferedCode != startCode)
-                    {
-                        Codes.Processor.CancelCode(bufferedCode);
-                    }
+                    Codes.Processor.CancelCode(bufferedCode);
                 }
                 BufferedCodes.Clear();
                 BytesBuffered = 0;