use a goto

Author: thinkyhead

Marlin/src/gcode/probe/G30.cpp

@@ -66,11 +66,7 @@ void GcodeSuite::G30() {
       SERIAL_ECHOLNF(GET_EN_TEXT_F(MSG_ZPROBE_OUT));
       LCD_MESSAGE(MSG_ZPROBE_OUT);
     #endif
-    // Restore the active tool after aborting
-    #if HAS_MULTI_HOTEND
-      tool_change(old_tool_index);   // Do move if one of these
-    #endif
-    return;
+    goto EXIT_G30;
   }
 
   // Disable leveling so the planner won't mess with us
@@ -103,10 +99,10 @@ void GcodeSuite::G30() {
   if (raise_after == PROBE_PT_STOW)
     probe.move_z_after_probing();
 
-  // Restore the active tool after probing
-  #if HAS_MULTI_HOTEND
-    tool_change(old_tool_index);   // Do move if one of these
-  #endif
+  EXIT_G30:
+
+  // Restore the active tool
+  TERN_(HAS_MULTI_HOTEND, tool_change(old_tool_index));
 
   report_current_position();
 }