From f87590b355e6a3384995cd0a7314071b10384d22 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 10 Jan 2015 22:38:58 +0100
Subject: [PATCH] Remap only IDs between 0 and 16 for now. Fixes some button
 combo issues with FBA.

---
 libretro_version_1.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libretro_version_1.c b/libretro_version_1.c
index 2a01c7f32b..299747ff79 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -418,7 +418,10 @@ static int16_t input_state(unsigned port, unsigned device,
    }
 
    if (g_settings.input.remap_binds_enable)
-      id = g_settings.input.remap_ids[port][id];
+   {
+      if (id >= 0 && id < RARCH_FIRST_CUSTOM_BIND)
+         id = g_settings.input.remap_ids[port][id];
+   }
 
    if (!driver.block_libretro_input)
    {