From 3644c940bfb443ac63e3c8c38f76dfe7c7e76632 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 13 Jan 2019 17:59:32 -0600
Subject: [PATCH] Tweak SD section of Main Menu

---
 Marlin/src/lcd/menu/menu_main.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp
index 4e419d84a..b643b06af 100644
--- a/Marlin/src/lcd/menu/menu_main.cpp
+++ b/Marlin/src/lcd/menu/menu_main.cpp
@@ -144,28 +144,31 @@ void menu_main() {
       MENU_ITEM(gcode, MSG_SWITCH_PS_ON, PSTR("M80"));
   #endif
 
-  //
-  // Autostart
-  //
-  #if ENABLED(SDSUPPORT) && ENABLED(MENU_ADDAUTOSTART)
-    if (!busy)
-      MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
-  #endif
+  #if ENABLED(SDSUPPORT)
+
+    //
+    // Autostart
+    //
+    #if ENABLED(MENU_ADDAUTOSTART)
+      if (!busy)
+        MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
+    #endif
 
-#if ENABLED(SDSUPPORT)
     if (card.isDetected() && !card.isFileOpen()) {
-      MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
       #if !PIN_EXISTS(SD_DETECT)
         MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21"));  // SD-card changed by user
       #endif
+      MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
     }
     else {
-      MENU_ITEM(function, MSG_NO_CARD, NULL);
       #if !PIN_EXISTS(SD_DETECT)
-        MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
+        MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually init SD-card
       #endif
+      MENU_ITEM(function, MSG_NO_CARD, NULL);
     }
-  #endif
+
+  #endif // SDSUPPORT
+
   END_MENU();
 }