From bb7243a412da204320e78ec1af11856aec9221da Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Wed, 20 Sep 2017 22:50:28 -0500
Subject: [PATCH 1/2] fix offset, add a couple comments

---
 menu/cbs/menu_cbs_scan.c     | 4 +++-
 menu/cbs/menu_cbs_sublabel.c | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c
index e6021d4f89..965e99207e 100644
--- a/menu/cbs/menu_cbs_scan.c
+++ b/menu/cbs/menu_cbs_scan.c
@@ -130,7 +130,9 @@ static int action_scan_input_desc(const char *path,
       unsigned char player_no_str = atoi(&label[1]);
 
       inp_desc_user      = (unsigned)(player_no_str - 1);
-      key                = (unsigned)(idx - 6);
+      /* This hardcoded value may cause issues if any entries are added on 
+         top of the input binds */
+      key                = (unsigned)(idx - 7);
    }
    else
       key = input_config_translate_str_to_bind_id(label);
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index 9a9682e71d..0a53bfe83f 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -372,6 +372,7 @@ static int action_bind_sublabel_netplay_room(
       const char *label, const char *path,
       char *s, size_t len)
 {
+   /* This offset may cause issues if any entries are added to this menu */
    unsigned offset        = i - 3;
 
    if (i < 1 || offset > (unsigned)netplay_room_count)

From a3f04ffa9b393267cc8f3fe191ec23b0a59bd4c5 Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Wed, 20 Sep 2017 23:00:41 -0500
Subject: [PATCH 2/2] update CHANGES.md

---
 CHANGES.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 61b7b52456..a12113b96d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,8 +1,16 @@
 # 1.6.8 (future)
+- Audio: Fix the Audio DSP picker
 - GUI: (MaterialUI) Skip querying and drawing items that are not visible; Cache content height and bbox calculation.
 - GUI: (XMB) Skip drawing the fading list when it is already transparent. Optimization.
 - GUI: (XMB) Comment out visible item calculation in xmb_draw_items().
 - GUI: (RGUI) Prevent crashes when using a non-English language reliant on UTF8.
+- INPUT: Always show the controls menu even if descriptors are not set
+- INPUT: Fix input descriptors not being set on cores that don't implement the controllers interface
+- INPUT: Apply descriptors only for the amount of cores the core supports
+- INPUT: Implement keyboard to gamepad input remapping (limited to one gamepad device for now)
+- INPUT: Fix absolute mouse move handling on the winraw driver
+- INPUT: Ignore keyboard input if window is not active on udev driver
+- LOBBIES: Fix crash on navigating left / right from the lobby menu
 - LOCALIZATION: Update Italian translation.
 - LOCALIZATION: Update Portuguese-Brazilian translation.
 - LOCALIZATION: Update Russian translation.
@@ -14,6 +22,7 @@
 - WINDOWS/WGL: Try to use wglSwapLayerBuffers instead of SwapBuffers if possible (for more optimal performance).
 - WII: Use custom, embedded libogc SDK.
 - WIIU: Initial touchscreen support for WiiU gamepad.
+- SCANNER: Fix archive scanning.
 
 # 1.6.7
 - SCANNER: Fix directory scanning.