From 5c9501b4c41e3ecedf30ecdab71e93f13ccc9101 Mon Sep 17 00:00:00 2001
From: sonninnos <tony@pihaus.org>
Date: Sat, 18 Jun 2022 08:54:14 +0300
Subject: [PATCH] Disc Control append focus correction

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

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 54e9c441e4..6b39519a84 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1152,7 +1152,19 @@ int generic_action_ok_displaylist_push(const char *path,
             dl_type            = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
 
             /* Focus on current content entry */
-            menu_driver_set_pending_selection(path_basename(path_get(RARCH_PATH_CONTENT)));
+            {
+               char path_content[PATH_MAX_LENGTH];
+               path_content[0] = '\0';
+               strlcpy(path_content, path_get(RARCH_PATH_CONTENT), sizeof(path_content));
+               /* Remove archive browsed file from the path */
+               if (strstr(path_content, "#"))
+               {
+                  char *token = strtok(path_content, "#");
+                  while (token != NULL)
+                     token = strtok(NULL, "#");
+               }
+               menu_driver_set_pending_selection(path_basename(path_content));
+            }
          }
          break;
       case ACTION_OK_DL_SUBSYSTEM_ADD_LIST: