Improved fix for M226/M600

Duet3D · Aug 1, 2024 · d08388b · d08388b
1 parent 431eafb
commit d08388b
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/DuetControlServer/Files/JobProcessor.cs b/src/DuetControlServer/Files/JobProcessor.cs
@@ -436,14 +436,11 @@ private static async Task DoFilePrint(CodeFile file)
                     {
                         try
                         {
-                            // Keep the next file position up-to-date in case we need to pause or fork this macro file
-                            if (!code.CancellationToken.IsCancellationRequested)
-                            {
-                                currentFilePosition = code.FilePosition ?? 0L;
-                            }
-
                             // Logging of regular messages is done by the code itself, no need to take care of it here
                             await code.Task;
+
+                            // Keep track of the file position
+                            currentFilePosition = (code.FilePosition ?? 0L) + (code.Length ?? 0L);
                         }
                         catch (OperationCanceledException)
                         {