save / restore state correctly

MarlinFirmware · Feb 9, 2022 · eb3a34f · eb3a34f
1 parent bdc29b0
commit eb3a34f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -93,6 +93,10 @@ class G29_State {
   bool      dryrun,
             reenable;
 
+  #if HAS_MULTI_HOTEND
+    uint8_t tool_index;
+  #endif
+
   #if EITHER(PROBE_MANUALLY, AUTO_BED_LEVELING_LINEAR)
     int abl_probe_index;
   #endif
@@ -264,7 +268,7 @@ G29_TYPE GcodeSuite::G29() {
   if (!g29_in_progress) {
 
     #if HAS_MULTI_HOTEND
-      const uint8_t old_active_extruder = active_extruder;
+      abl.tool_index = active_extruder;
       if (active_extruder) tool_change(0);
     #endif
 
@@ -455,8 +459,6 @@ G29_TYPE GcodeSuite::G29() {
       }
     #endif // AUTO_BED_LEVELING_BILINEAR
 
-    TERN_(HAS_MULTI_HOTEND, if (old_active_extruder != 0) tool_change(old_active_extruder));
-
   } // !g29_in_progress
 
   #if ENABLED(PROBE_MANUALLY)
@@ -896,6 +898,8 @@ G29_TYPE GcodeSuite::G29() {
 
   TERN_(HAS_DWIN_E3V2_BASIC, DWIN_CompletedLeveling());
 
+  TERN_(HAS_MULTI_HOTEND, if (abl.tool_index != 0) tool_change(abl.tool_index));
+
   report_current_position();
 
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_IDLE));