diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-01-05 14:14:10 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-01-05 14:14:10 +0300 |
| commit | 93f00c189f717a591b07902e69608bf8b60be230 (patch) | |
| tree | 3ac4fc8688ddd06ddf40b9cc80e49cc4963ca0e1 | |
| parent | 4d61c60a21f75e9c2efd9819b42ff22db8abe066 (diff) | |
| parent | 6964587a6f81f0ac0dd19f647a03963e8a80a7f6 (diff) | |
Merge branch 'v3-chrishamm' into v3.02-dev3.2
| -rw-r--r-- | src/Linux/LinuxInterface.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Linux/LinuxInterface.cpp b/src/Linux/LinuxInterface.cpp index 6391bb00..d8450f6b 100644 --- a/src/Linux/LinuxInterface.cpp +++ b/src/Linux/LinuxInterface.cpp @@ -592,6 +592,11 @@ void LinuxInterface::Init() noexcept if (channel.IsValid()) { GCodeBuffer * const gb = reprap.GetGCodes().GetGCodeBuffer(channel); + if (gb->IsWaitingForMacro()) + { + gb->ResolveMacroRequest(true, false); + } + MutexLocker locker(gb->mutex, 10); if (locker) { |