From 4406fba9942f682dd59c8d96188ce5f48d31d980 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 7 Jun 2017 11:14:30 -0500 Subject: [PATCH] Fixes #6975 --- Marlin/Marlin_main.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d88286c4df..1717026b3f 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7918,20 +7918,19 @@ inline void gcode_M121() { endstops.enable_globally(false); } #ifdef PAUSE_PARK_X_POS + PAUSE_PARK_X_POS #endif + #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE) + + (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0) + #endif ; const float y_pos = parser.seen('Y') ? parser.value_linear_units() : 0 #ifdef PAUSE_PARK_Y_POS + PAUSE_PARK_Y_POS #endif + #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE) + + (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0) + #endif ; - #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE) - if (active_extruder > 0) { - if (!parser.seen('X')) x_pos += hotend_offset[X_AXIS][active_extruder]; - if (!parser.seen('Y')) y_pos += hotend_offset[Y_AXIS][active_extruder]; - } - #endif - const bool job_running = print_job_timer.isRunning(); if (pause_print(retract, z_lift, x_pos, y_pos)) {