define out the safe mode message if none

Neradoc · Neradoc · commit 8f82db5b2229 · 2022-10-30T03:55:59.000+01:00
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -2011,6 +2011,10 @@ msgid ""
 "exit safe mode."
 msgstr ""
 
+#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
+msgid "The central button was pressed at start up.\n"
+msgstr ""
+
 #: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
 msgid "The left button was pressed at start up.\n"
 msgstr ""
@@ -3839,10 +3843,6 @@ msgstr ""
 msgid "pow() with 3 arguments requires integers"
 msgstr ""
 
-#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
-msgid "The central button was pressed at start up.\n"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
 msgstr ""
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
@@ -146,17 +146,17 @@ void print_safe_mode_message(safe_mode_t reason) {
 
     switch (reason) {
         case USER_SAFE_MODE:
-            #ifdef BOARD_USER_SAFE_MODE_ACTION
+            #if defined(BOARD_USER_SAFE_MODE_ACTION)
             message = BOARD_USER_SAFE_MODE_ACTION;
             #elif defined(CIRCUITPY_BOOT_BUTTON)
             message = translate("The BOOT button was pressed at start up.\n");
             #endif
-            if (message != NULL) {
-                // Output a user safe mode string if it's set.
-                serial_write_compressed(message);
-                message = translate("To exit, please reset the board without requesting safe mode.");
-                // The final piece is printed below.
-            }
+            #if defined(BOARD_USER_SAFE_MODE_ACTION) || defined(CIRCUITPY_BOOT_BUTTON)
+            // Output a user safe mode string if it's set.
+            serial_write_compressed(message);
+            message = translate("To exit, please reset the board without requesting safe mode.");
+            // The final piece is printed below.
+            #endif
             break;
         case MANUAL_SAFE_MODE:
             message = translate("You pressed the reset button during boot. Press again to exit safe mode.");
