diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 89445c2742..ac98181654 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -117,16 +117,17 @@ static int action_left_input_desc(unsigned type, const char *label, static int action_left_input_desc_kbd(unsigned type, const char *label, bool wraparound) { - settings_t *settings = config_get_ptr(); - unsigned key_id; - unsigned offset = type - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; - unsigned remap_id = - settings->uints.input_keymapper_ids[offset]; char desc[PATH_MAX_LENGTH]; + unsigned key_id; + unsigned remap_id; + unsigned offset = type - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; + settings_t *settings = config_get_ptr(); if (!settings) return 0; + remap_id = settings->uints.input_keymapper_ids[offset]; + for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++) { if(remap_id == key_descriptors[key_id].key) diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index b82c7613aa..f3bc4aabff 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -107,15 +107,16 @@ int action_right_input_desc_kbd(unsigned type, const char *label, bool wraparound) { unsigned key_id; + unsigned remap_id; char desc[PATH_MAX_LENGTH]; unsigned offset = type - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; settings_t *settings = config_get_ptr(); - unsigned remap_id = - settings->uints.input_keymapper_ids[offset]; if (!settings) return 0; + remap_id = settings->uints.input_keymapper_ids[offset]; + for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++) { if(remap_id == key_descriptors[key_id].key)