From f017c642206e3cad2b01921c7025aaff363300ce Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 27 Jun 2016 07:18:02 +0200 Subject: [PATCH] Add FILE_PATH_CORE_INFO_EXTENSION --- file_path_special.h | 3 ++- file_path_str.c | 2 ++ menu/menu_displaylist.c | 10 +++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/file_path_special.h b/file_path_special.h index f07e4995c4..3b528ba444 100644 --- a/file_path_special.h +++ b/file_path_special.h @@ -45,7 +45,8 @@ enum file_path_enum FILE_PATH_STATE_EXTENSION, FILE_PATH_RTC_EXTENSION, FILE_PATH_CHT_EXTENSION, - FILE_PATH_LPL_EXTENSION + FILE_PATH_LPL_EXTENSION, + FILE_PATH_CORE_INFO_EXTENSION }; enum application_special_type diff --git a/file_path_str.c b/file_path_str.c index 4364062010..e9fb2676a4 100644 --- a/file_path_str.c +++ b/file_path_str.c @@ -19,6 +19,8 @@ const char *file_path_str(enum file_path_enum enum_idx) { switch (enum_idx) { + case FILE_PATH_CORE_INFO_EXTENSION: + return ".info"; case FILE_PATH_RTC_EXTENSION: return ".rtc"; case FILE_PATH_CHT_EXTENSION: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index b212ef596a..67111d10b6 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -132,7 +132,9 @@ static void print_buf_lines(file_list_t *list, char *buf, if (!string_is_equal(last, "_libretro")) *last = '\0'; } - strlcat(core_path, ".info", sizeof(core_path)); + strlcat(core_path, + file_path_str(FILE_PATH_CORE_INFO_EXTENSION), + sizeof(core_path)); if (core_info_get_display_name( core_path, display_name, sizeof(display_name))) @@ -236,12 +238,14 @@ static void print_buf_lines_extended(file_list_t *list, char *buf, int buf_size, path_remove_extension(core_path); path_remove_extension(core_path); last = (char*)strrchr(core_path, '_'); - if (*last) + if (!string_is_empty(last)) { if (!string_is_equal(last, "_libretro")) *last = '\0'; } - strlcat(core_path, ".info", sizeof(core_path)); + strlcat(core_path, + file_path_str(FILE_PATH_CORE_INFO_EXTENSION), + sizeof(core_path)); if (core_info_get_display_name( core_path, display_name, sizeof(display_name)))