From ed3ab5e212b96e259c0fb1def783fde06c35d0c7 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
<38436470+InsanityAutomation@users.noreply.github.com>
Date: Sat, 12 Jan 2019 16:30:44 -0500
Subject: [PATCH] Fix M24 not starting new job (#12887)
---
.../sdcard/M20-M30_M32-M34_M524_M928.cpp | 23 +++++++++++--------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp
index b3aae0bfc1..f1cdaa1078 100644
--- a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp
+++ b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp
@@ -92,18 +92,21 @@ void GcodeSuite::M24() {
#endif
#if ENABLED(PARK_HEAD_ON_PAUSE)
- resume_print();
- #else
- if (card.isFileOpen()) {
- card.startFileprint();
- print_job_timer.start();
+ if (did_pause_print) {
+ resume_print();
+ return;
}
+ #endif
- ui.reset_status();
-
- #ifdef ACTION_ON_RESUME
- SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
- #endif
+ if (card.isFileOpen()) {
+ card.startFileprint();
+ print_job_timer.start();
+ }
+
+ ui.reset_status();
+
+ #ifdef ACTION_ON_RESUME
+ SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
#endif
}
--
GitLab