nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do_menu allow VOICE_ONLY strings 

Enable Voice_Blank and other Voice only LANG_IDs to be used in menus

Change-Id: I3432ed00963617e9f92cd52228bf00e0a776523a
This commit is contained in:
William Wilgus 2020-07-26 23:48:25 -04:00 committed by William Wilgus
parent 796eba4c81
commit a898f36182
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/menu.c
View File

@ -97,6 +97,7 @@ static const char* get_menu_item_name(int selected_item,
char *buffer,
size_t buffer_len)
{
const char *name;
const struct menu_item_ex *menu = (const struct menu_item_ex *)data;
int type = (menu->flags&MENU_TYPE_MASK);
selected_item = get_menu_selection(selected_item, menu);
@ -105,9 +106,17 @@ static const char* get_menu_item_name(int selected_item,
if (type == MT_RETURN_ID)
{
if (menu->flags&MENU_DYNAMIC_DESC)
return menu->menu_get_name_and_icon->list_get_name(selected_item,
{
name = menu->menu_get_name_and_icon->list_get_name(selected_item,
menu->menu_get_name_and_icon->list_get_name_data, buffer, buffer_len);
return menu->strings[selected_item];
}
else
name = menu->strings[selected_item];
if (P2ID((unsigned char *)name) > VOICEONLY_DELIMITER)
name = "";
return name;
}
if (type == MT_MENU)
menu = menu->submenus[selected_item];