From 9f69fbe5ee6baf8897eeb36bba0bfd73c12b9d9a Mon Sep 17 00:00:00 2001
From: InsanityAutomation
 <38436470+InsanityAutomation@users.noreply.github.com>
Date: Sat, 25 May 2019 16:16:00 -0400
Subject: [PATCH] Move some menu items (#14118)

---
 Marlin/src/lcd/menu/menu_main.cpp        |  2 +-
 Marlin/src/lcd/menu/menu_temperature.cpp | 28 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index d04baaa3b5..93ebe75781 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -265,7 +265,6 @@ void menu_main() {
 
     if (card_detected) {
       if (!card_open) {
-        MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
         MENU_ITEM(gcode,
           #if PIN_EXISTS(SD_DETECT)
             MSG_CHANGE_SDCARD, PSTR("M21")
@@ -273,6 +272,7 @@ void menu_main() {
             MSG_RELEASE_SDCARD, PSTR("M22")
           #endif
         );
+        MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
       }
     }
     else {
diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
index 012c0d574e..f41fb18e79 100644
--- a/Marlin/src/lcd/menu/menu_temperature.cpp
+++ b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -414,18 +414,12 @@ void menu_temperature() {
     #endif
   #endif // FAN_COUNT > 0
 
+  #if ENABLED(SPINDLE_LASER_ENABLE)
+    MENU_ITEM(submenu, MSG_LASER_MENU, menu_spindle_laser);
+  #endif
+  
   #if HAS_TEMP_HOTEND
 
-    //
-    // Cooldown
-    //
-    bool has_heat = false;
-    HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; }
-    #if HAS_TEMP_BED
-      if (thermalManager.temp_bed.target) has_heat = true;
-    #endif
-    if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
-
     //
     // Preheat for Material 1 and 2
     //
@@ -437,11 +431,17 @@ void menu_temperature() {
       MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only);
     #endif
 
-  #endif // HAS_TEMP_HOTEND
+    //
+    // Cooldown
+    //
+    bool has_heat = false;
+    HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; }
+    #if HAS_TEMP_BED
+      if (thermalManager.temp_bed.target) has_heat = true;
+    #endif
+    if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
 
-  #if ENABLED(SPINDLE_LASER_ENABLE)
-    MENU_ITEM(submenu, MSG_LASER_MENU, menu_spindle_laser);
-  #endif
+  #endif // HAS_TEMP_HOTEND
 
   END_MENU();
 }