diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 7273d769bb..f4e2e4c82b 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1782,7 +1782,6 @@ static void xmb_draw_items(xmb_handle_t *xmb, { math_matrix_4x4 mymat; menu_display_ctx_rotate_draw_t rotate_draw; - uint32_t hash_label = menu_hash_calculate(entry.label); uintptr_t texture = xmb_icon_get_id(xmb, core_node, node, entry.enum_idx, entry.type, (i == current)); float x = icon_x; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 81dc3ef2f8..0c90a7e319 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3756,8 +3756,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) { char lbl[PATH_MAX_LENGTH] = {0}; unsigned val = atoi(info->path); - snprintf(lbl, sizeof(lbl), - menu_hash_to_str_enum(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + (val-1))); + const char *temp_val = menu_hash_to_str_enum((enum menu_hash_enums)(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + (val-1))); + strlcpy(lbl, temp_val, sizeof(lbl)); ret = menu_displaylist_parse_settings(menu, info, lbl, PARSE_NONE, true); info->need_refresh = true; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index cacd06c888..05a2b8c6ea 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3700,16 +3700,19 @@ static bool setting_append_list_input_player_options( rarch_setting_group_info_t group_info = {0}; rarch_setting_group_info_t subgroup_info = {0}; settings_t *settings = config_get_ptr(); + const char *temp_value = NULL; const struct retro_keybind* const defaults = (user == 0) ? retro_keybinds_1 : retro_keybinds_rest; rarch_system_info_t *system = NULL; runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); + temp_value =menu_hash_to_str_enum((enum menu_hash_enums)(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + user)); + snprintf(buffer[user], sizeof(buffer[user]), "%s %u", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_USER), user + 1); - snprintf(group_lbl[user], sizeof(group_lbl[user]), - menu_hash_to_str_enum(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + user)); + + strlcpy(group_lbl[user], temp_value, sizeof(group_lbl[user])); START_GROUP(list, list_info, &group_info, group_lbl[user], parent_group);