From ba791b7de8e3b5cd0d536d9a3827b23c53f3c830 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 21 Apr 2021 15:57:02 +0200
Subject: [PATCH] Add better fix that targets all statically linked platforms
 instead of

---
 retroarch.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/retroarch.c b/retroarch.c
index 0d4db54a19..d3804f4701 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -35441,6 +35441,7 @@ bool retroarch_main_init(int argc, char *argv[])
    /* Handle core initialization failure */
    if (init_failed)
    {
+#ifdef HAVE_DYNAMIC
       /* Check if menu was active prior to core initialization */
       if (   !global->launched_from_cli
           || global->cli_load_menu_on_error
@@ -35448,14 +35449,17 @@ bool retroarch_main_init(int argc, char *argv[])
           || p_rarch->menu_driver_alive
 #endif
          )
+#endif
       {
          /* Attempt initializing dummy core */
          p_rarch->current_core_type = CORE_TYPE_DUMMY;
          if (!command_event(CMD_EVENT_CORE_INIT, &p_rarch->current_core_type))
             goto error;
       }
+#ifdef HAVE_DYNAMIC
       else /* Fall back to regular error handling */
          goto error;
+#endif
    }
 
 #ifdef HAVE_CHEATS