Tweak SD section of Main Menu

Marlin/src/lcd/menu/menu_main.cpp

@@ -144,28 +144,31 @@ void menu_main() {
       MENU_ITEM(gcode, MSG_SWITCH_PS_ON, PSTR("M80"));
   #endif
 
+  #if ENABLED(SDSUPPORT)
+
     //
     // Autostart
     //
-  #if ENABLED(SDSUPPORT) && ENABLED(MENU_ADDAUTOSTART)
+    #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();
 }