From e6421f6f8bfad33fe2fc52ef510d172a6025defe Mon Sep 17 00:00:00 2001 From: zoltanvb <101990835+zoltanvb@users.noreply.github.com> Date: Sat, 10 Dec 2022 18:06:45 +0100 Subject: [PATCH] Use sublabel as help text if there is no suitable definition. (#14714) * Use sublabel as help text if there is no suitable definition. * code style update --- menu/menu_driver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/menu/menu_driver.c b/menu/menu_driver.c index e8158c3f38..ce39e1114a 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -7554,6 +7554,18 @@ static int generic_menu_iterate( default: ret = msg_hash_get_help_enum(cbs->enum_idx, menu->menu_state_msg, sizeof(menu->menu_state_msg)); + + if (string_is_equal(menu->menu_state_msg, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE))) + { + get_current_menu_sublabel( + menu_st, + menu->menu_state_msg, sizeof(menu->menu_state_msg)); + if (string_is_equal(menu->menu_state_msg, "")) + strlcpy(menu->menu_state_msg, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), + sizeof(menu->menu_state_msg)); + } break; }