Browse Source

Fix M24 not starting new job (#12887)

InsanityAutomation 6 years ago
parent
commit
ed3ab5e212
1 changed files with 13 additions and 10 deletions
  1. 13
    10
      Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp

+ 13
- 10
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp View File

@@ -92,18 +92,21 @@ void GcodeSuite::M24() {
92 92
   #endif
93 93
 
94 94
   #if ENABLED(PARK_HEAD_ON_PAUSE)
95
-    resume_print();
96
-  #else
97
-    if (card.isFileOpen()) {
98
-      card.startFileprint();
99
-      print_job_timer.start();
95
+    if (did_pause_print) {
96
+      resume_print();
97
+      return;
100 98
     }
99
+  #endif
101 100
 
102
-    ui.reset_status();
103
-    
104
-    #ifdef ACTION_ON_RESUME
105
-      SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
106
-    #endif
101
+  if (card.isFileOpen()) {
102
+    card.startFileprint();
103
+    print_job_timer.start();
104
+  }
105
+
106
+  ui.reset_status();
107
+
108
+  #ifdef ACTION_ON_RESUME
109
+    SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
107 110
   #endif
108 111
 }
109 112
 

Loading…
Cancel
Save