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) {