From 32d8d892f5792bc5d3f8ced45c9da63c8ca73972 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 10 Dec 2021 01:43:59 +0100 Subject: [PATCH] Actually call UnconditionalStop() in Stop()->lcd_print_stop() Remove incorrect check introduced during development. --- Firmware/ultralcd.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bc35e6a0..50bdeb97 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7088,13 +7088,10 @@ static void lcd_sd_updir() void lcd_print_stop() { - if (!IsStopped()) { - // Stop the print if we didn't already due to an error - if (!card.sdprinting) { - SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); // for Octoprint - } - UnconditionalStop(); + if (!card.sdprinting) { + SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); // for Octoprint } + UnconditionalStop(); // TODO: all the following should be moved in the main marlin loop! #ifdef MESH_BED_LEVELING