Cancel Objects - As seen at ERRF2019 (#15590)

Marlin/src/gcode/sdcard/M24_M25.cpp

@@ -42,6 +42,8 @@
   #include "../../feature/power_loss_recovery.h"
 #endif
 
+#include "../../Marlin.h" // for startOrResumeJob
+
 /**
  * M24: Start or Resume SD Print
  */
@@ -54,14 +56,14 @@ void GcodeSuite::M24() {
 
   #if ENABLED(PARK_HEAD_ON_PAUSE)
     if (did_pause_print) {
-      resume_print();
+      resume_print(); // will call print_job_timer.start()
       return;
     }
   #endif
 
   if (card.isFileOpen()) {
-    card.startFileprint();
-    print_job_timer.start();
+    card.startFileprint();            // SD card will now be read for commands
+    startOrResumeJob();               // Start (or resume) the print job timer
     #if ENABLED(POWER_LOSS_RECOVERY)
       recovery.prepare();
     #endif

Marlin/src/gcode/sdcard/M32.cpp

@@ -29,6 +29,8 @@
 #include "../../module/printcounter.h"
 #include "../../module/planner.h"
 
+#include "../../Marlin.h" // for startOrResumeJob
+
 /**
  * M32: Select file and start SD Print
  *
@@ -52,7 +54,7 @@ void GcodeSuite::M32() {
     card.startFileprint();
 
     // Procedure calls count as normal print time.
-    if (!call_procedure) print_job_timer.start();
+    if (!call_procedure) startOrResumeJob();
   }
 }