From bc611b8cc187c34aa48551991e76f8384a32cd02 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 2 Sep 2014 23:42:40 +0200
Subject: [PATCH] (Menu) Add MENU_FILE_PLAYLIST_ENTRY

---
 frontend/frontend.c                         |  3 +--
 frontend/menu/backend/menu_common_backend.c | 17 +++++++++++------
 frontend/menu/menu_common.h                 |  1 +
 frontend/menu/menu_entries.c                |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/frontend/frontend.c b/frontend/frontend.c
index 31016edd51..8cdedad982 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -176,8 +176,7 @@ static int main_entry_iterate_menu(args_type() args)
    g_extern.lifecycle_state |= (1ULL << MODE_CLEAR_INPUT);
 
    /* If QUIT state came from command interface, we'll only see it
-    * once due to MODE_CLEAR_INPUT.
-    */
+    * once due to MODE_CLEAR_INPUT. */
    if (input_key_pressed_func(RARCH_QUIT_KEY) ||
          !driver.video->alive(driver.video_data))
       return 1;
diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 2684658258..46fa96f67a 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -1780,6 +1780,11 @@ static int menu_action_ok(const char *dir, unsigned menu_type)
    file_list_get_at_offset(driver.menu->selection_buf,
          driver.menu->selection_ptr, &path, &label, &type);
 
+#if 0
+   RARCH_LOG("type     : %d\n", type == MENU_FILE_USE_DIRECTORY);
+   RARCH_LOG("type id  : %d\n", type);
+#endif
+
    if (menu_parse_check(label, type) == 0)
    {
       char cat_path[PATH_MAX];
@@ -1788,6 +1793,12 @@ static int menu_action_ok(const char *dir, unsigned menu_type)
       menu_entries_push(driver.menu->menu_stack,
             cat_path, "browser_list", type, driver.menu->selection_ptr);
    }
+   else if (type == MENU_FILE_PLAYLIST_ENTRY)
+   {
+      load_menu_content_history(driver.menu->selection_ptr);
+      menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS);
+      return -1;
+   }
    else
    {
 #ifdef HAVE_SHADER_MANAGER
@@ -1886,12 +1897,6 @@ static int menu_action_ok(const char *dir, unsigned menu_type)
          menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS);
          return -1;
       }
-      else if (menu_type == MENU_SETTINGS_OPEN_HISTORY)
-      {
-         load_menu_content_history(driver.menu->selection_ptr);
-         menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS);
-         return -1;
-      }
       else if (menu_type == MENU_CONTENT_HISTORY_PATH)
       {
          if ((setting = (rarch_setting_t*)setting_data_find_setting(
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 03d742a41b..12c5466589 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -59,6 +59,7 @@ typedef enum
    MENU_FILE_PLAIN,
    MENU_FILE_DIRECTORY,
    MENU_FILE_DEVICE,
+   MENU_FILE_PLAYLIST_ENTRY,
    MENU_FILE_USE_DIRECTORY,
    MENU_SETTINGS,
 } menu_file_type_t;
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index eff159818b..075e119615 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -173,7 +173,7 @@ int menu_entries_push_list(menu_handle_t *menu,
                }
 
                file_list_push(list, fill_buf, "",
-                     MENU_FILE_PLAIN, 0);
+                     MENU_FILE_PLAYLIST_ENTRY, 0);
 
                do_action = true;
             }