mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-24 18:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix regression with slashes appearing in some strings

Browse Source
This commit is contained in:
Brad Parker 2019-07-09 11:28:27 -04:00
parent 119245e88b
commit 307cdad450
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menu/menu_displaylist.c
View File

@ -168,7 +168,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
if (!info_list[i].name) if (!info_list[i].name)
continue; continue;
fill_pathname_join_concat(tmp, fill_pathname_join_concat_noext(tmp,
msg_hash_to_str(info_list[i].msg), msg_hash_to_str(info_list[i].msg),
": ", ": ",
info_list[i].name, info_list[i].name,
@ -345,7 +345,7 @@ static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info
(void)tmp_string; (void)tmp_string;
#ifdef HAVE_GIT_VERSION #ifdef HAVE_GIT_VERSION
fill_pathname_join_concat( fill_pathname_join_concat_noext(
tmp, tmp,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION),
": ", ": ",
@ -493,7 +493,7 @@ static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info
tmp2[0] = '\0'; tmp2[0] = '\0';
fill_pathname_join_concat( fill_pathname_join_concat_noext(
tmp, tmp,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_IDENTIFIER), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_IDENTIFIER),
": ", ": ",
@ -509,7 +509,7 @@ static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info
{ {
frontend->get_lakka_version(tmp2, sizeof(tmp2)); frontend->get_lakka_version(tmp2, sizeof(tmp2));
fill_pathname_join_concat(tmp, fill_pathname_join_concat_noext(tmp,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LAKKA_VERSION), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LAKKA_VERSION),
": ", ": ",
tmp2, tmp2,
@ -525,7 +525,7 @@ static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info
{ {
frontend->get_name(tmp2, sizeof(tmp2)); frontend->get_name(tmp2, sizeof(tmp2));
fill_pathname_join_concat(tmp, fill_pathname_join_concat_noext(tmp,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_NAME), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_NAME),
": ", ": ",
tmp2, tmp2,
@ -661,7 +661,7 @@ static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info
break; break;
} }
fill_pathname_join_concat(tmp, fill_pathname_join_concat_noext(tmp,
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE), MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE),
": ", ": ",
@ -678,7 +678,7 @@ static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info
video_context_driver_get_ident(&ident_info); video_context_driver_get_ident(&ident_info);
tmp_string = ident_info.ident; tmp_string = ident_info.ident;
fill_pathname_join_concat(tmp, fill_pathname_join_concat_noext(tmp,
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VIDEO_CONTEXT_DRIVER), MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VIDEO_CONTEXT_DRIVER),
": ", ": ",
@ -809,7 +809,7 @@ static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info
for (i = 0; i < ARRAY_SIZE(info_list); i++) for (i = 0; i < ARRAY_SIZE(info_list); i++)
{ {
fill_pathname_join_concat(feat_str, fill_pathname_join_concat_noext(feat_str,
msg_hash_to_str( msg_hash_to_str(
info_list[i].msg), info_list[i].msg),
": ", ": ",
@ -987,7 +987,7 @@ static int create_string_list_rdb_entry_string(
string_list_join_concat(output_label, str_len, str_list, "|"); string_list_join_concat(output_label, str_len, str_list, "|");
string_list_free(str_list); string_list_free(str_list);
fill_pathname_join_concat(tmp, desc, ": ", fill_pathname_join_concat_noext(tmp, desc, ": ",
actual_string, path_size); actual_string, path_size);
menu_entries_append_enum(list, tmp, output_label, menu_entries_append_enum(list, tmp, output_label,
enum_idx, enum_idx,
@ -1181,7 +1181,7 @@ static int menu_displaylist_parse_database_entry(menu_handle_t *menu,
if (db_info_entry->name) if (db_info_entry->name)
{ {
fill_pathname_join_concat(tmp, fill_pathname_join_concat_noext(tmp,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME),
": ", ": ",
db_info_entry->name, db_info_entry->name,
@ -1193,7 +1193,7 @@ static int menu_displaylist_parse_database_entry(menu_handle_t *menu,
} }
if (db_info_entry->description) if (db_info_entry->description)
{ {
fill_pathname_join_concat(tmp, fill_pathname_join_concat_noext(tmp,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DESCRIPTION), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DESCRIPTION),
": ", ": ",
db_info_entry->description, db_info_entry->description,
@ -1205,7 +1205,7 @@ static int menu_displaylist_parse_database_entry(menu_handle_t *menu,
} }
if (db_info_entry->genre) if (db_info_entry->genre)
{ {
fill_pathname_join_concat(tmp, fill_pathname_join_concat_noext(tmp,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_GENRE), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_GENRE),
": ", ": ",
db_info_entry->genre, db_info_entry->genre,

2
retroarch.c
View File

@ -11206,7 +11206,7 @@ void video_driver_set_title_buf(void)
struct retro_system_info info; struct retro_system_info info;
core_get_system_info(&info); core_get_system_info(&info);
fill_pathname_join_concat( fill_pathname_join_concat_noext(
video_driver_title_buf, video_driver_title_buf,
msg_hash_to_str(MSG_PROGRAM), msg_hash_to_str(MSG_PROGRAM),
" ", " ",