diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 201adbe55e..f90516a3a1 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -294,7 +294,7 @@ static void glui_render_menu_list(glui_handle_t *glui, { unsigned y; menu_entry_t entry; - char entry_value[PATH_MAX_LENGTH]; + char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char message[PATH_MAX_LENGTH], entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; bool selected = false; @@ -302,9 +302,10 @@ static void glui_render_menu_list(glui_handle_t *glui, menu_entry_get(&entry, i, NULL, true); selected = menu_entry_is_currently_selected(&entry); menu_entry_get_value(i, entry_value, sizeof(entry_value)); + menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_animation_ticker_line(entry_title_buf, glui->ticker_limit, - frame_count / 100, entry.path, selected); + frame_count / 100, entry_label, selected); menu_animation_ticker_line(type_str_buf, glui->ticker_limit, frame_count / 100, entry_value, selected); diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 59d120c8c3..21b4e5d0cc 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -442,7 +442,7 @@ static void rgui_render(void) for (; i < end; i++, y += FONT_HEIGHT_STRIDE) { menu_entry_t entry; - char entry_value[PATH_MAX_LENGTH]; + char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char message[PATH_MAX_LENGTH], entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; bool selected = false; @@ -454,9 +454,10 @@ static void rgui_render(void) continue; menu_entry_get_value(i, entry_value, sizeof(entry_value)); + menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_animation_ticker_line(entry_title_buf, RGUI_TERM_WIDTH - (entry.spacing + 1 + 2), - frame_count / RGUI_TERM_START_X, entry.path, selected); + frame_count / RGUI_TERM_START_X, entry_label, selected); menu_animation_ticker_line(type_str_buf, entry.spacing, frame_count / RGUI_TERM_START_X, entry_value, selected); diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c index 354176be5f..c8dd16a129 100644 --- a/menu/drivers/rmenu.c +++ b/menu/drivers/rmenu.c @@ -190,7 +190,7 @@ static void rmenu_render(void) for (i = begin; i < end; i++, j++) { menu_entry_t entry; - char entry_value[PATH_MAX_LENGTH]; + char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; char message[PATH_MAX_LENGTH], entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; bool selected = false; @@ -198,9 +198,10 @@ static void rmenu_render(void) menu_entry_get(&entry, i, NULL, true); selected = menu_entry_is_currently_selected(&entry); menu_entry_get_value(i, entry_value, sizeof(entry_value)); + menu_entry_get_label(i, entry_label, sizeof(entry_label)); menu_animation_ticker_line(entry_title_buf, RMENU_TERM_WIDTH - (entry.spacing + 1 + 2), - frame_count / 15, entry.path, selected); + frame_count / 15, entry_label, selected); menu_animation_ticker_line(type_str_buf, entry.spacing, frame_count / 15, entry_value, selected); diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp index f8865777c7..8372dc8d89 100644 --- a/menu/drivers/rmenu_xui.cpp +++ b/menu/drivers/rmenu_xui.cpp @@ -567,13 +567,14 @@ static void rmenu_xui_render(void) for (i = 0; i < end; i++) { menu_entry_t entry; - char entry_value[PATH_MAX_LENGTH]; + char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; wchar_t msg_left[PATH_MAX_LENGTH], msg_right[PATH_MAX_LENGTH]; menu_entry_get(&entry, i, NULL, true); menu_entry_get_value(i, entry_value, sizeof(entry_value)); + menu_entry_get_label(i, entry_label, sizeof(entry_label)); - mbstowcs(msg_left, entry.path, sizeof(msg_left) / sizeof(wchar_t)); + mbstowcs(msg_left, entry_label, sizeof(msg_left) / sizeof(wchar_t)); mbstowcs(msg_right, entry_value, sizeof(msg_right) / sizeof(wchar_t)); rmenu_xui_set_list_text(i, msg_left, msg_right); } diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 2bcdea224a..5b52b695cf 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -981,7 +981,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, for (i = 0; i < end; i++) { menu_entry_t entry; - char entry_value[PATH_MAX_LENGTH]; + char entry_label[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; float icon_x, icon_y; char name[PATH_MAX_LENGTH], value[PATH_MAX_LENGTH]; GLuint texture_switch = 0; @@ -1004,9 +1004,10 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, continue; menu_entry_get(&entry, i, list, true); + menu_entry_get_label(i, entry_label, sizeof(entry_label)); if (entry.type == MENU_FILE_CONTENTLIST_ENTRY) - strlcpy(entry.path, path_basename(entry.path), sizeof(entry.path)); + strlcpy(entry_label, path_basename(entry_label), sizeof(entry_label)); icon = xmb_icon_get_type(xmb, core_node, entry.type); @@ -1031,9 +1032,8 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl, else if (!strcmp(entry.label, "resume_content")) icon = xmb->textures.list[XMB_TEXTURE_RESUME].id; - menu_animation_ticker_line(name, 35, - frame_count / 20, entry.path, + frame_count / 20, entry_label, (i == current)); xmb_draw_text(menu, xmb, name,