From a4b478524a6b87c1eaaf7bbf3659e51ff0e95454 Mon Sep 17 00:00:00 2001
From: Eric Warmenhoven <eric@warmenhoven.org>
Date: Tue, 17 Dec 2024 08:24:20 -0500
Subject: [PATCH] iOS/tvOS: Fix more places where paths weren't expanded
 correctly (#17265)

---
 menu/cbs/menu_cbs_ok.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 869400fb55..3f6a87b936 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1000,7 +1000,12 @@ int generic_action_ok_displaylist_push(
       case ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE:
          if (menu)
          {
+#if IOS
+            fill_pathname_expand_special(tmp, menu->scratch2_buf, sizeof(tmp));
+            menu_path    = tmp;
+#else
             menu_path    = menu->scratch2_buf;
+#endif
             content_path = menu->scratch_buf;
          }
          if (content_path)
@@ -2008,8 +2013,16 @@ static int file_load_with_detect_core_wrapper(
          if (path_is_absolute(menu->scratch_buf))
             strlcpy(menu_path_new, menu->scratch_buf, sizeof(menu_path_new));
          else
+         {
+#if IOS
+            fill_pathname_join_special(tmp_path,
+                  menu->scratch2_buf, menu->scratch_buf, sizeof(tmp_path));
+            fill_pathname_expand_special(menu_path_new, tmp_path, sizeof(menu_path_new));
+#else
             fill_pathname_join_special(menu_path_new,
                   menu->scratch2_buf, menu->scratch_buf, sizeof(menu_path_new));
+#endif
+         }
       }
       else if (string_is_equal(menu_label,
                msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ARCHIVE_OPEN)))