From 812f6a7dd7344d387949b75f9126a605f10d8199 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 6 Nov 2018 20:55:00 -0600 Subject: [PATCH] Fix Resume from SD Pause In reference to https://github.com/MarlinFirmware/Marlin/pull/12098#issuecomment-436231690 --- Marlin/src/gcode/feature/pause/M125.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Marlin/src/gcode/feature/pause/M125.cpp b/Marlin/src/gcode/feature/pause/M125.cpp index 4da4eaa4bb..ed98b8fc2c 100644 --- a/Marlin/src/gcode/feature/pause/M125.cpp +++ b/Marlin/src/gcode/feature/pause/M125.cpp @@ -68,14 +68,16 @@ void GcodeSuite::M125() { park_point.y += (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0); #endif - const bool job_running = print_job_timer.isRunning(); + const bool job_running = print_job_timer.isRunning(), + sd_printing = IS_SD_PRINTING(); - if (pause_print(retract, park_point) && !IS_SD_PRINTING()) { - wait_for_confirmation(); // Wait for lcd click or M108 - resume_print(); // Return to print position and continue + if (pause_print(retract, park_point)) { + if (!sd_printing) { + wait_for_confirmation(); + resume_print(); + } + if (job_running) print_job_timer.start(); } - - if (job_running) print_job_timer.start(); } #endif // PARK_HEAD_ON_PAUSE