From 8198e5c0b2fe28f935bd13cb352b7707c244b85a Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Thu, 19 Apr 2018 09:54:16 -0500
Subject: [PATCH 1/2] fix #6596

---
 input/input_remapping.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/input/input_remapping.c b/input/input_remapping.c
index 964d78d8ab..f92eb20d86 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -221,7 +221,6 @@ bool input_remapping_save_file(const char *path)
             if (settings->uints.input_keymapper_ids[i][j] != RETROK_UNKNOWN)
                config_set_int(conf, key_ident[j], 
                   settings->uints.input_keymapper_ids[i][j]);
-
          }
          else
          {
@@ -237,7 +236,7 @@ bool input_remapping_save_file(const char *path)
                config_set_int(conf, stk_ident[k], 
                   -1);
             else
-               config_unset(conf,btn_ident[j]);
+               config_unset(conf, stk_ident[k]);
          }
       }
       snprintf(s1, sizeof(s1), "input_libretro_device_p%u", i + 1);

From d8b5fea374666d7a1fe899b69f07d325f63ac18b Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Thu, 19 Apr 2018 10:07:59 -0500
Subject: [PATCH 2/2] fix coverity warnings

---
 menu/cbs/menu_cbs_left.c  | 2 +-
 menu/cbs/menu_cbs_right.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 6e306b3b97..c39289f671 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -403,7 +403,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
    if (key_id > 0)
       key_id--;
    else
-      key_id = RARCH_MAX_KEYS + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
+      key_id = (RARCH_MAX_KEYS - 1) + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
 
    settings->uints.input_keymapper_ids[offset][id] = key_descriptors[key_id].key;
 
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index fd5c9ff8f1..82b287240e 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -126,9 +126,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
          break;
    }
 
-   RARCH_LOG("o:%u t:%u i:%u r:%u\n", offset, type, id, remap_id);
-
-   if (key_id < RARCH_MAX_KEYS + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN)
+   if (key_id < (RARCH_MAX_KEYS - 1) + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN)
       key_id++;
    else
       key_id = 0;