From a898f361825c8319819a3cb08272e9e79d5aeb8f Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sun, 26 Jul 2020 23:48:25 -0400 Subject: Do_menu allow VOICE_ONLY strings Enable Voice_Blank and other Voice only LANG_IDs to be used in menus Change-Id: I3432ed00963617e9f92cd52228bf00e0a776523a --- apps/menu.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/menu.c b/apps/menu.c index 1e0cb3668f..fefc8fca2b 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -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]; -- cgit v1.2.3