Skip to content

Commit a8b990e

Browse files
committed
Finished last bug fix
1 parent 0c1de66 commit a8b990e

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

src/DuetControlServer/Codes/Pipelines/PipelineBase.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,7 @@ public virtual Task<bool> FlushAsync(CodeFile file)
154154
return stackItem.FlushAsync();
155155
}
156156
}
157-
158-
Processor.Logger.Warn("Failed to find corresponding state for file flush request, falling back to current state");
159-
return CurrentStackItem.FlushAsync();
157+
return Task.FromResult(false);
160158
}
161159
}
162160

@@ -178,9 +176,7 @@ public virtual Task<bool> FlushAsync(Commands.Code code, bool evaluateExpression
178176
return stackItem.FlushAsync(code);
179177
}
180178
}
181-
182-
Processor.Logger.Warn("Failed to find corresponding state for code flush request, falling back to current state");
183-
return CurrentStackItem.FlushAsync(code);
179+
return Task.FromResult(false);
184180
}
185181
}
186182

src/DuetControlServer/SPI/Channel/Processor.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,7 @@ public void FilesAborted(bool abortAll)
604604
// Invalidate remaining buffered codes from the last macro file
605605
foreach (Code bufferedCode in BufferedCodes)
606606
{
607-
if (bufferedCode != startCode)
608-
{
609-
Codes.Processor.CancelCode(bufferedCode);
610-
}
607+
Codes.Processor.CancelCode(bufferedCode);
611608
}
612609
BufferedCodes.Clear();
613610
BytesBuffered = 0;

0 commit comments

Comments
 (0)