From 992cdc8d14e589cbc6d5fe5b4b8fca8e2b4e12e9 Mon Sep 17 00:00:00 2001
From: Marcio Teixeira <marcio@alephobjects.com>
Date: Tue, 19 Feb 2019 13:45:03 -0700
Subject: [PATCH] Fix host action / G-code ordering in event_probe_failure
 (#13207)

Observing from the console, it makes the most sense to do `//action:probe_retry` before executing commands.
---
 Marlin/src/Marlin.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index f899143d2..4ec826f6c 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -386,12 +386,12 @@ void disable_all_steppers() {
 #if ENABLED(G29_RETRY_AND_RECOVER)
 
   void event_probe_failure() {
+    #ifdef ACTION_ON_G29_FAILURE
+      host_action(PSTR(ACTION_ON_G29_FAILURE));
+    #endif
     #ifdef G29_FAILURE_COMMANDS
       gcode.process_subcommands_now_P(PSTR(G29_FAILURE_COMMANDS));
     #endif
-    #ifdef ACTION_ON_G29_FAILURE
-      host_action(PSTR(ACTION_ON_G29_FAILURE)); }
-    #endif
     #if ENABLED(G29_HALT_ON_FAILURE)
       #ifdef ACTION_ON_CANCEL
         host_action_cancel();
@@ -404,12 +404,12 @@ void disable_all_steppers() {
     #if ENABLED(HOST_PROMPT_SUPPORT)
       host_prompt_do(PROMPT_INFO, PSTR("G29 Retrying"));
     #endif
-    #ifdef G29_RECOVER_COMMANDS
-      gcode.process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
-    #endif
     #ifdef ACTION_ON_G29_RECOVER
       host_action(PSTR(ACTION_ON_G29_RECOVER));
     #endif
+    #ifdef G29_RECOVER_COMMANDS
+      gcode.process_subcommands_now_P(PSTR(G29_RECOVER_COMMANDS));
+    #endif
   }
 
 #endif