From c68c8a8cfe53bad63abdb9c5b7dba4109d691371 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 25 Apr 2017 18:48:06 +0200
Subject: [PATCH] Rewrite this

---
 input/input_remapping.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/input/input_remapping.c b/input/input_remapping.c
index f3da621e69..49a0db9b77 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -18,6 +18,7 @@
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
+#include "input_config.h"
 #include "input_remapping.h"
 #include "../configuration.h"
 #include "../retroarch.h"
@@ -173,7 +174,10 @@ void input_remapping_set_defaults(void)
    for (i = 0; i < MAX_USERS; i++)
    {
       for (j = 0; j < RARCH_FIRST_CUSTOM_BIND; j++)
-         settings->input.remap_ids[i][j] = settings->input.binds[i][j].id;
+      {
+         const struct  retro_keybind *keybind = input_config_get_specific_bind(i, j);
+         settings->input.remap_ids[i][j]      = keybind->id;
+      }
       for (j = 0; j < 4; j++)
          settings->input.remap_ids[i][RARCH_FIRST_CUSTOM_BIND + j] = j;
    }