From 606bece1f0e8aaf037a2abc0247059dcf9ad382c Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sat, 28 Oct 2023 23:40:01 +0300
Subject: [PATCH] libretro: fix option mismatch

---
 frontend/libretro.c              | 35 +++++++++++++-------------------
 frontend/libretro_core_options.h | 12 +++++++----
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/frontend/libretro.c b/frontend/libretro.c
index cf875beb..c7439dd4 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -2250,6 +2250,7 @@ static void update_variables(bool in_flight)
          spu_config.iUseThread = 0;
    }
 
+#if 0 // currently disabled, see USE_READ_THREAD in libpcsxcore/cdriso.c
    if (P_HAVE_PTHREAD) {
 	   var.value = NULL;
 	   var.key = "pcsx_rearmed_async_cd";
@@ -2272,6 +2273,7 @@ static void update_variables(bool in_flight)
 		  }
        }
    }
+#endif
 
    var.value = NULL;
    var.key = "pcsx_rearmed_noxadecoding";
@@ -2573,6 +2575,18 @@ static void update_variables(bool in_flight)
       mouse_sensitivity = atof(var.value);
    }
 
+   if (found_bios)
+   {
+      var.value = NULL;
+      var.key = "pcsx_rearmed_show_bios_bootlogo";
+      if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+      {
+         Config.SlowBoot = 0;
+         if (strcmp(var.value, "enabled") == 0)
+            Config.SlowBoot = 1;
+      }
+   }
+
    if (in_flight)
    {
       // inform core things about possible config changes
@@ -2590,27 +2604,6 @@ static void update_variables(bool in_flight)
 
       /* dfinput_activate(); */
    }
-   else
-   {
-      //not yet running
-
-      //bootlogo display hack
-      if (found_bios)
-      {
-         var.value = NULL;
-         var.key = "pcsx_rearmed_show_bios_bootlogo";
-         if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-         {
-            Config.SlowBoot = 0;
-            rebootemu = 0;
-            if (strcmp(var.value, "enabled") == 0)
-            {
-               Config.SlowBoot = 1;
-               rebootemu = 1;
-            }
-         }
-      }
-   }
 
    update_option_visibility();
 }
diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index 8379ade9..5ec62f4b 100644
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -1577,13 +1577,18 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       },
       "disabled",
    },
+#endif /* !DRC_DISABLE && !LIGHTREC */
    {
       "pcsx_rearmed_nostalls",
-      "(Speed Hack) Disable CPU/GTE Stalls",
       "Disable CPU/GTE Stalls",
-      "Will cause some games to run too quickly.",
       NULL,
-      "speed_hack",
+      "Will cause some games to run too quickly."
+#if defined(LIGHTREC)
+      " Interpreter only."
+#endif
+      ,
+      NULL,
+      "compat_hack",
       {
          { "disabled", NULL },
          { "enabled",  NULL },
@@ -1591,7 +1596,6 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       },
       "disabled",
    },
-#endif /* !DRC_DISABLE && !LIGHTREC */
    { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
 };
 
-- 
2.39.2