From 747a2263c8eb7d7a8683aeea25d5af8b2ad3c9dc Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 5 Aug 2015 05:55:04 +0200
Subject: [PATCH] (menu_cbs_select.c) Implement action_select_directory

---
 menu/cbs/menu_cbs_ok.c     |  2 +-
 menu/cbs/menu_cbs_select.c | 14 +++++++++++---
 menu/menu_cbs.h            |  3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 69cdbdace7..f4e8989c61 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1124,7 +1124,7 @@ static int action_ok_compressed_archive_push(const char *path,
    return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
 }
 
-static int action_ok_directory_push(const char *path,
+int action_ok_directory_push(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
    menu_displaylist_info_t info   = {0};
diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index 5c77020cab..54082cd438 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -51,12 +51,18 @@ static int action_select_default(const char *path, const char *label, unsigned t
    return ret;
 }
 
-static int action_select_directory(const char *path, const char *label, unsigned type,
+static int action_select_directory_stub(const char *path, const char *label, unsigned type,
       size_t idx)
 {
    return 0;
 }
 
+static int action_select_directory(const char *path, const char *label, unsigned type,
+      size_t idx)
+{
+   return action_ok_directory_push(path, label, type, idx, 0 /* ignored */);
+}
+
 static int action_select_core_setting(const char *path, const char *label, unsigned type,
       size_t idx)
 {
@@ -90,11 +96,13 @@ static int menu_cbs_init_bind_select_compare_type(
    {
       switch (type)
       {
-         case MENU_FILE_PATH:
          case MENU_FILE_DIRECTORY:
-         case MENU_FILE_USE_DIRECTORY:
             cbs->action_select = action_select_directory;
             break;
+         case MENU_FILE_PATH:
+         case MENU_FILE_USE_DIRECTORY:
+            cbs->action_select = action_select_directory_stub;
+            break;
          default:
             return -1;
       }
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 3590e04edf..7d4a2b38eb 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -33,6 +33,9 @@ extern char core_updater_path[PATH_MAX_LENGTH];
 
 /* Function callbacks */
 
+int action_ok_directory_push(const char *path,
+      const char *label, unsigned type, size_t idx, size_t entry_idx);
+
 int core_setting_right(unsigned type, const char *label,
       bool wraparound);