From efc0371a4ee3b396c69393db714772cb96a61824 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 8 Jul 2016 16:27:16 +0200 Subject: [PATCH] menu_entry_get_label - prepare for being able to show custom labels --- menu/menu_entry.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/menu/menu_entry.c b/menu/menu_entry.c index 70c4a14146..465eb48038 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -16,6 +16,7 @@ #include #include +#include #include "menu_driver.h" #include "menu_display.h" @@ -90,7 +91,10 @@ void menu_entry_get_label(uint32_t i, char *s, size_t len) menu_entry_t entry = {{0}}; menu_entry_get(&entry, 0, i, NULL, true); - strlcpy(s, entry.label, len); + if (!string_is_empty(entry.rich_label)) + strlcpy(s, entry.rich_label, len); + else + strlcpy(s, entry.label, len); } unsigned menu_entry_get_spacing(uint32_t i)