diff options
| author | Manuel Coenen <manuel@duet3d.com> | 2021-03-10 12:54:44 +0300 |
|---|---|---|
| committer | Manuel Coenen <manuel@duet3d.com> | 2021-03-10 12:54:44 +0300 |
| commit | 2cef720bfd4760b21bffddf16aaaafac993eaf88 (patch) | |
| tree | 24378f1f0461e3002ee1ae851a312158a6992e20 /src/GCodes | |
| parent | 68cfaacc16424ff08e53a2c52c51a76ecc7f98ba (diff) | |
| parent | 08c611c79cb08510c8b8c20eba72a1928f8bd577 (diff) | |
Merge remote-tracking branch 'origin/3.3-dev' into wil-extend-m111
Diffstat (limited to 'src/GCodes')
| -rw-r--r-- | src/GCodes/GCodes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index 67e5b4e6..5ed70116 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -542,7 +542,7 @@ bool GCodes::SpinGCodeBuffer(GCodeBuffer& gb) noexcept result = true; // assume we did something useful (not necessarily true, e.g. could be waiting for movement to stop) } - if (gb.IsExecuting()) + if (gb.IsExecuting() || (isWaiting && !cancelWait)) { CheckReportDue(gb, reply.GetRef()); } |