From 2747e920baf4346bde62dc65dbdbfa3df39fe3cd Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Thu, 15 Jun 2023 18:43:00 +0200 Subject: Track Info: Never return NULL in list item name callback Just for good measure Change-Id: I9dc25b2fd687da2b1fddf31ce1c1ea8895e4399c --- apps/screens.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/screens.c b/apps/screens.c index 4c220e4751..50b7711fa7 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -729,11 +729,11 @@ static const char * id3_get_or_speak_info(int selected_item, void* data, } /* gui_synclist callback */ -static const char* id3_get_info(int selected_item, void* data, - char *buffer, size_t buffer_len) +static const char* id3_get_name_cb(int selected_item, void* data, + char *buffer, size_t buffer_len) { return id3_get_or_speak_info(selected_item, data, buffer, - buffer_len, false); + buffer_len, false) ? : ""; } static int id3_speak_item(int selected_item, void* data) @@ -774,11 +774,11 @@ refresh_info: { char temp[8]; info.info_id[i] = i; - if (id3_get_info((i*2)+1, &info, temp, 8) != NULL) + if (id3_get_or_speak_info((i*2)+1, &info, temp, 8, false) != NULL) info.info_id[info.count++] = i; } - gui_synclist_init(&id3_lists, &id3_get_info, &info, true, 2, NULL); + gui_synclist_init(&id3_lists, &id3_get_name_cb, &info, true, 2, NULL); if(global_settings.talk_menu) gui_synclist_set_voice_callback(&id3_lists, id3_speak_item); gui_synclist_set_nb_items(&id3_lists, info.count*2); -- cgit v1.2.3