From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Thu, 11 Feb 2021 08:48:08 +0000 (+0800)
Subject: Set multitap options disabled by default, prevent previous defaults from being accide... 
X-Git-Tag: r24l~593^2~1
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f948beb799e227ea23319c87bf6dbd11f24ab38;p=pcsx_rearmed.git

Set multitap options disabled by default, prevent previous defaults from being accidentally loaded instead.
---

diff --git a/frontend/libretro.c b/frontend/libretro.c
index f93e33a8..d312e426 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 ca61b276..cf896059 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 },