Preliminary bug fixes for pauses in macros

Duet3D · Sep 17, 2024 · fa674a2 · fa674a2
1 parent 9b047be
commit fa674a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/DuetControlServer/Codes/Pipelines/ProcessInternally.cs b/src/DuetControlServer/Codes/Pipelines/ProcessInternally.cs
@@ -1,4 +1,5 @@
-using DuetAPI.Commands;
+using DuetAPI;
+using DuetAPI.Commands;
 using DuetAPI.Connection;
 using System;
 using System.Threading.Tasks;
@@ -33,6 +34,12 @@ public override async Task ProcessCodeAsync(Commands.Code code)
                 }
                 catch (Exception e)
                 {
+                    if (e is CodeParserException && code.CancellationToken.IsCancellationRequested)
+                    {
+                        // We may get here when a code is cancelled while an evaluation request is being processed
+                        e = new OperationCanceledException();
+                    }
+
                     if (e is not OperationCanceledException)
                     {
                         Processor.Logger.Error(e, "Failed to execute code {0} on internal processing stage", code);

diff --git a/src/DuetControlServer/SPI/Channel/Processor.cs b/src/DuetControlServer/SPI/Channel/Processor.cs
@@ -1286,8 +1286,8 @@ public void PrintPaused()
             // Invalidate pending requests
             InvalidateRegular();
 
-            // Clear pausable macros
-            while (CurrentState.File is MacroFile { IsPausable: true })
+            // Clear macros. When we get here, RRF has done the same
+            while (CurrentState.File is MacroFile)
             {
                 Pop();
             }