From 5f948beb799e227ea23319c87bf6dbd11f24ab38 Mon Sep 17 00:00:00 2001
From: negativeExponent
Date: Thu, 11 Feb 2021 16:48:08 +0800
Subject: Set multitap options disabled by default, prevent previous defaults
 from being accidentally loaded instead.

---
 frontend/libretro.c              | 8 ++++----
 frontend/libretro_core_options.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/libretro.c b/frontend/libretro.c
index f93e33a..d312e42 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -589,11 +589,11 @@ static void update_multitap(void)
          multitap1 = 1;
       else if (strcmp(var.value, "disabled") == 0)
          multitap1 = 0;
-      else // 'auto' case
+      else if (strcmp(var.value, "automatic") == 0)
          auto_case = 1;
    }
    else
-      auto_case = 1;
+      multitap1 = 0;
 
    if (auto_case)
    {
@@ -612,11 +612,11 @@ static void update_multitap(void)
          multitap2 = 1;
       else if (strcmp(var.value, "disabled") == 0)
          multitap2 = 0;
-      else // 'auto' case
+      else if (strcmp(var.value, "automatic") == 0)
          auto_case = 1;
    }
    else
-      auto_case = 1;
+      multitap2 = 0;
 
    if (auto_case)
    {
diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index ca61b27..cf89605 100644
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -161,7 +161,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "Multitap 1 (Restart)",
       "Enables/Disables multitap on port 1, allowing upto 5 players in games that permit it.",
       {
-         { "auto",     NULL },
+         { "automatic",     NULL },
          { "disabled", NULL },
          { "enabled",  NULL },
          { NULL, NULL },
@@ -173,7 +173,7 @@ struct retro_core_option_definition option_defs_us[] = {
       "Multitap 2 (Restart)",
       "Enables/Disables multitap on port 2, allowing up to 8 players in games that permit it. Multitap 1 has to be enabled for this to work.",
       {
-         { "auto",     NULL },
+         { "automatic",     NULL },
          { "disabled", NULL },
          { "enabled",  NULL },
          { NULL, NULL },
-- 
cgit v1.2.3


From 51279cec66e5ef62ee9d3c907f937e3b8724644f Mon Sep 17 00:00:00 2001
From: negativeExponent
Date: Thu, 11 Feb 2021 16:49:57 +0800
Subject: Do not hide multitap core options

---
 frontend/libretro.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/libretro.c b/frontend/libretro.c
index d312e42..91721af 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -2132,8 +2132,6 @@ static void update_variables(bool in_flight)
          unsigned i;
          struct retro_core_option_display option_display;
          char gpu_peops_option[][50] = {
-            "pcsx_rearmed_multitap1",
-            "pcsx_rearmed_multitap2",
             "pcsx_rearmed_negcon_deadzone",
             "pcsx_rearmed_negcon_response",
             "pcsx_rearmed_analog_axis_modifier",
-- 
cgit v1.2.3