From 3e886df637606c2b451f2ac04c05c3a0d69c9201 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 29 Oct 2016 15:04:20 +0200
Subject: [PATCH] (XMB) Add 'Scan File' to horizontal 'Import Content' tab
 (XMB) Hide 'Scan Content' on Main Menu since we already have a tab dedicated
 to it, and it unclutters the main menu

---
 menu/menu_displaylist.c |  6 ++++++
 menu/menu_setting.c     | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index b50e79f614..6593b843f9 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2906,6 +2906,12 @@ static int menu_displaylist_parse_scan_directory_list(
          msg_hash_to_str(MENU_ENUM_LABEL_SCAN_DIRECTORY),
          MENU_ENUM_LABEL_SCAN_DIRECTORY,
          MENU_SETTING_ACTION, 0, 0);
+
+   menu_entries_append_enum(info->list,
+         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCAN_FILE),
+         msg_hash_to_str(MENU_ENUM_LABEL_SCAN_FILE),
+         MENU_ENUM_LABEL_SCAN_FILE,
+         MENU_SETTING_ACTION, 0, 0);
 #endif
 
    return 0;
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 97871cf4b6..92a84c8875 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2178,13 +2178,16 @@ static bool setting_append_list(
                   parent_group);
          }
 
-         CONFIG_ACTION(
-               list, list_info,
-               MENU_ENUM_LABEL_ADD_CONTENT_LIST,
-               MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST,
-               &group_info,
-               &subgroup_info,
-               parent_group);
+         if (!string_is_equal(settings->menu.driver, "xmb"))
+         {
+            CONFIG_ACTION(
+                  list, list_info,
+                  MENU_ENUM_LABEL_ADD_CONTENT_LIST,
+                  MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group);
+         }
 
 #if defined(HAVE_NETWORKING)
          CONFIG_ACTION(