diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-05-19 14:01:14 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-05-19 14:01:14 +0300 |
| commit | 56ef4ec45bdc3049b2ab331e221cf5d0dc2a8bb4 (patch) | |
| tree | f0b9cc1c4d57c55c75f83d1651506bf4c97f16ea | |
| parent | 9866c31eed3d4730a8a3a2ea2ec0827a06d75695 (diff) | |
| parent | 7e3b64e085741750776d2c91480fef3e044332fd (diff) | |
Merge branch 'v3.01-dev' of https://github.com/dc42/RepRapFirmware.git into v3.01-dev3.1.1
| -rw-r--r-- | src/GCodes/GCodes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index 3d048781..03cd0e9d 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -422,8 +422,8 @@ void GCodes::Spin() noexcept // Get the GCodeBuffer that we want to process a command from. Use round-robin scheduling but give priority to auto-pause. GCodeBuffer *gbp = autoPauseGCode; if (gbp->IsCompletelyIdle() -#if HAS_MASS_STORAGE - && !(gbp->MachineState().fileState.IsLive()) +#if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE + && !gbp->MachineState().DoingFile() #endif ) // if autoPause is not active { |