Merge pull request #12742 from sonninnos/content-info

Show content info label+path rows always
This commit is contained in:
Autechre 2021-08-05 22:48:23 +02:00 committed by GitHub
commit 5dcec3819e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 28 deletions

View File

@ -4068,36 +4068,34 @@ static unsigned menu_displaylist_parse_content_information(
} }
/* Content label */ /* Content label */
if (!string_is_empty(content_label)) tmp[0] = '\0';
{ snprintf(tmp, sizeof(tmp),
tmp[0] = '\0'; "%s: %s",
snprintf(tmp, sizeof(tmp), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONTENT_INFO_LABEL),
"%s: %s", !string_is_empty(content_label)
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONTENT_INFO_LABEL), ? content_label
content_label : msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)
); );
if (menu_entries_append_enum(info->list, tmp, if (menu_entries_append_enum(info->list, tmp,
msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_INFO_LABEL), msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_INFO_LABEL),
MENU_ENUM_LABEL_CONTENT_INFO_LABEL, MENU_ENUM_LABEL_CONTENT_INFO_LABEL,
0, 0, 0)) 0, 0, 0))
count++; count++;
}
/* Content path */ /* Content path */
if (!string_is_empty(content_path)) tmp[0] = '\0';
{ snprintf(tmp, sizeof(tmp),
tmp[0] = '\0'; "%s: %s",
snprintf(tmp, sizeof(tmp), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONTENT_INFO_PATH),
"%s: %s", !string_is_empty(content_path)
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONTENT_INFO_PATH), ? content_path
content_path : msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)
); );
if (menu_entries_append_enum(info->list, tmp, if (menu_entries_append_enum(info->list, tmp,
msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_INFO_PATH), msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_INFO_PATH),
MENU_ENUM_LABEL_CONTENT_INFO_PATH, MENU_ENUM_LABEL_CONTENT_INFO_PATH,
0, 0, 0)) 0, 0, 0))
count++; count++;
}
/* Core name */ /* Core name */
if (!string_is_empty(core_name) && if (!string_is_empty(core_name) &&