diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2022-03-10 00:11:44 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2022-03-10 00:11:44 +0300 |
| commit | 89c14792ff410f27fee31dbc08ab65563e0fd0db (patch) | |
| tree | 2428ef4c026cc91059587a3e622599de6a4348a5 /src | |
| parent | b19519242f27830532bddb3b5ef9dd877338c812 (diff) | |
Version 3.4-rc2+3
Bug fix: Message acknowledgment wasn't always working as intended
Diffstat (limited to 'src')
| -rw-r--r-- | src/GCodes/GCodeBuffer/GCodeBuffer.cpp | 2 | ||||
| -rw-r--r-- | src/Version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/GCodes/GCodeBuffer/GCodeBuffer.cpp b/src/GCodes/GCodeBuffer/GCodeBuffer.cpp index 1c5f85bd..48455163 100644 --- a/src/GCodes/GCodeBuffer/GCodeBuffer.cpp +++ b/src/GCodes/GCodeBuffer/GCodeBuffer.cpp @@ -1016,7 +1016,7 @@ void GCodeBuffer::MessageAcknowledged(bool cancelled) noexcept ms->messageAcknowledged = true; ms->messageCancelled = cancelled; #if HAS_SBC_INTERFACE - messageAcknowledged = true; + messageAcknowledged = !cancelled || !ms->DoingFile(); reprap.GetSbcInterface().EventOccurred(); #endif } diff --git a/src/Version.h b/src/Version.h index 4ba52251..c7b0dece 100644 --- a/src/Version.h +++ b/src/Version.h @@ -10,7 +10,7 @@ #ifndef VERSION // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it. -# define MAIN_VERSION "3.4.0rc2+2" +# define MAIN_VERSION "3.4.0rc2+3" # ifdef USE_CAN0 # define VERSION_SUFFIX "(CAN0)" # else |