From fb8c73508b6eaa856406d6cb57a5b1bf3480e300 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 24 May 2021 18:40:40 +0200
Subject: [PATCH] Apply diff patch taking care of issues

---
 core_info.c            | 7 ++++++-
 menu/cbs/menu_cbs_ok.c | 3 +--
 menu/menu_setting.c    | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/core_info.c b/core_info.c
index fa26d3ccf2..69075fe98f 100644
--- a/core_info.c
+++ b/core_info.c
@@ -1809,13 +1809,18 @@ static core_info_list_t *core_info_list_new(const char *path,
    core_info_list->list  = core_info;
    core_info_list->count = path_list->core_list->size;
 
-   /* Read core info cache, if enabled */
+#if !defined(IOS)
+   /* 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)
    {
       core_info_cache_list = core_info_cache_read(info_dir);
       if (!core_info_cache_list)
          goto error;
    }
+#endif
 
    for (i = 0; i < path_list->core_list->size; i++)
    {
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index bf5b50d46a..1b48e304ab 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2446,9 +2446,8 @@ static int action_ok_playlist_entry_collection(const char *path,
       }
       else
       {
-#ifndef IOS
          core_info = playlist_entry_get_core_info(entry);
-#endif
+
          if (core_info && !string_is_empty(core_info->path))
             strlcpy(core_path, core_info->path, sizeof(core_path));
          else
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 660b67fed0..37c0afde35 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -9396,6 +9396,11 @@ static bool setting_append_list(
 #endif
             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(
                      list, list_info,
                      bool_entries[i].target,