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

Merge pull request #12855 from jdgleaver/core-info-cache-path

Browse Source 
Remove core path from core info cache
This commit is contained in:
Autechre 2021-08-24 11:27:31 +02:00 committed by GitHub
commit cc7247aecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core_info.c
View File

@ -159,9 +159,7 @@ static bool CCJSONObjectMemberHandler(void *context, const char *pValue, size_t
} }
break; break;
case 'p': case 'p':
if (string_is_equal(pValue, "path")) if (string_is_equal(pValue, "permissions"))
pCtx->current_string_val = &pCtx->core_info->path;
else if (string_is_equal(pValue, "permissions"))
{ {
pCtx->current_string_val = &pCtx->core_info->permissions; pCtx->current_string_val = &pCtx->core_info->permissions;
pCtx->current_string_list_val = &pCtx->core_info->permissions_list; pCtx->current_string_list_val = &pCtx->core_info->permissions_list;
@ -815,14 +813,6 @@ static bool core_info_cache_write(core_info_cache_list_t *list, const char *info
rjsonwriter_add_start_object(writer); rjsonwriter_add_start_object(writer);
rjsonwriter_add_newline(writer); rjsonwriter_add_newline(writer);
rjsonwriter_add_spaces(writer, 6);
rjsonwriter_add_string(writer, "path");
rjsonwriter_add_colon(writer);
rjsonwriter_add_space(writer);
rjsonwriter_add_string(writer, info->path);
rjsonwriter_add_comma(writer);
rjsonwriter_add_newline(writer);
rjsonwriter_add_spaces(writer, 6); rjsonwriter_add_spaces(writer, 6);
rjsonwriter_add_string(writer, "display_name"); rjsonwriter_add_string(writer, "display_name");
rjsonwriter_add_colon(writer); rjsonwriter_add_colon(writer);
@ -1813,18 +1803,13 @@ static core_info_list_t *core_info_list_new(const char *path,
core_info_list->list = core_info; core_info_list->list = core_info;
core_info_list->count = path_list->core_list->size; core_info_list->count = path_list->core_list->size;
#if !defined(IOS) /* Read core info cache, if enabled */
/* Read core info cache, if enabled
* > This functionality is hard disabled on iOS/tvOS,
* where core path changes on every install
* (invalidating any cached parameters) */
if (enable_cache) if (enable_cache)
{ {
core_info_cache_list = core_info_cache_read(info_dir); core_info_cache_list = core_info_cache_read(info_dir);
if (!core_info_cache_list) if (!core_info_cache_list)
goto error; goto error;
} }
#endif
for (i = 0; i < path_list->core_list->size; i++) for (i = 0; i < path_list->core_list->size; i++)
{ {
@ -1851,6 +1836,12 @@ static core_info_list_t *core_info_list_new(const char *path,
if (info_cache) if (info_cache)
{ {
core_info_copy(info_cache, info); core_info_copy(info_cache, info);
/* Core path is 'dynamic', and cannot
* be cached (i.e. core directory may
* change between runs) */
if (info->path)
free(info->path);
info->path = strdup(base_path);
/* Core lock status is 'dynamic', and /* Core lock status is 'dynamic', and
* cannot be cached */ * cannot be cached */
info->is_locked = core_info_path_is_locked(path_list->lock_list, info->is_locked = core_info_path_is_locked(path_list->lock_list,

5
menu/menu_setting.c
View File

@ -9754,11 +9754,6 @@ static bool setting_append_list(
#endif #endif
for (i = 0; i < ARRAY_SIZE(bool_entries); i++) for (i = 0; i < ARRAY_SIZE(bool_entries); i++)
{ {
#if defined(IOS)
if (bool_entries[i].name_enum_idx ==
MENU_ENUM_LABEL_CORE_INFO_CACHE_ENABLE)
continue;
#endif
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
bool_entries[i].target, bool_entries[i].target,