mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8428 from jdgleaver/core-display-name

Browse Source 
Always use core 'display name' when populating playlists
This commit is contained in:
Twinaphex 2019-03-07 18:35:48 +01:00 committed by GitHub
commit 187f2fd6b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core_info.c
View File

@ -800,7 +800,8 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
void core_info_get_name(const char *path, char *s, size_t len,
const char *path_info, const char *dir_cores,
const char *exts, bool dir_show_hidden_files)
const char *exts, bool dir_show_hidden_files,
bool get_display_name)
{
size_t i;
const char *path_basedir = !string_is_empty(path_info) ?
@ -842,7 +843,7 @@ void core_info_get_name(const char *path, char *s, size_t len,
continue;
}
if (config_get_string(conf, "corename",
if (config_get_string(conf, get_display_name ? "display_name" : "corename",
&new_core_name))
{
strlcpy(s, new_core_name, len);

3
core_info.h
View File

@ -101,7 +101,8 @@ bool core_info_get_display_name(const char *path, char *s, size_t len);
void core_info_get_name(const char *path, char *s, size_t len,
const char *path_info, const char *dir_cores,
const char *exts, bool show_hidden_files);
const char *exts, bool show_hidden_files,
bool get_display_name);
core_info_t *core_info_get(core_info_list_t *list, size_t i);

3
menu/cbs/menu_cbs_ok.c
View File

@ -2672,7 +2672,8 @@ static int action_ok_core_deferred_set(const char *new_core_path,
settings->paths.path_libretro_info,
settings->paths.directory_libretro,
ext_name,
settings->bools.show_hidden_files);
settings->bools.show_hidden_files,
true);
command_playlist_update_write(
NULL,
menu->scratchpad.unsigned_var,

17
tasks/task_content.c
View File

@ -1041,9 +1041,24 @@ static bool task_load_content(content_ctx_info_t *content_info,
#endif
break;
default:
{
core_info_t *core_info = NULL;
/* Set core path */
core_path = path_get(RARCH_PATH_CORE);
core_name = info->library_name;
/* Set core display name
* (As far as I can tell, core_info_get_current_core()
* should always provide a valid pointer here...) */
core_info_get_current_core(&core_info);
if (core_info)
core_name = core_info->display_name;
if (string_is_empty(core_name))
core_name = info->library_name;
break;
}
}
if (launched_from_cli)