From 1fc97df8194e2a5ed8a094c1a445782a32e7cd91 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 21 Sep 2015 21:32:23 +0200
Subject: [PATCH] Revert "Add action_type to menu_displaylist_push_list"

This reverts commit b7d0f451091a7d56ace026a92faea1c3ee6bbbaf.
---
 menu/cbs/menu_cbs_deferred_push.c | 104 +++++++++++++++---------------
 menu/cbs/menu_cbs_info.c          |   2 +-
 menu/cbs/menu_cbs_ok.c            |   2 +-
 menu/drivers/xmb.c                |   8 +--
 menu/menu_displaylist.c           |  12 ++--
 menu/menu_displaylist.h           |   2 +-
 menu/menu_input.c                 |   4 +-
 menu/menu_iterate.c               |   6 +-
 menu/menu_setting.c               |   4 +-
 9 files changed, 68 insertions(+), 76 deletions(-)

diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 5e9cd2b3a1..338ca42c27 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -32,42 +32,42 @@ int cb_core_content_list(void *data_, size_t len);
 
 static int deferred_push_core_information(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CORE_INFO, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CORE_INFO);
 }
 
 static int deferred_push_system_information(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_SYSTEM_INFO, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_SYSTEM_INFO);
 }
 
 static int deferred_push_rdb_collection(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_PLAYLIST_COLLECTION, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_PLAYLIST_COLLECTION);
 }
 
 static int deferred_push_help(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_HELP_SCREEN_LIST, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_HELP_SCREEN_LIST);
 }
 
 static int deferred_push_rdb_entry_detail(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_ENTRY, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_ENTRY);
 }
 
 static int deferred_push_rpl_entry_actions(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS);
 }
 
 static int deferred_push_core_list_deferred(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CORES_SUPPORTED, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CORES_SUPPORTED);
 }
 
 static int deferred_push_core_collection_list_deferred(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CORES_COLLECTION_SUPPORTED, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CORES_COLLECTION_SUPPORTED);
 }
 
 static int deferred_push_database_manager_list_deferred(menu_displaylist_info_t *info)
@@ -75,7 +75,7 @@ static int deferred_push_database_manager_list_deferred(menu_displaylist_info_t
    strlcpy(info->path_b,    info->path, sizeof(info->path_b));
    info->path_c[0] = '\0';
 
-   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_QUERY, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_QUERY);
 }
 
 static int deferred_push_cursor_manager_list_deferred(menu_displaylist_info_t *info)
@@ -103,7 +103,7 @@ static int deferred_push_cursor_manager_list_deferred(menu_displaylist_info_t *i
    strlcpy(info->path,   rdb_path,   sizeof(info->path));
    strlcpy(info->path_c,    query,   sizeof(info->path_c));
 
-   ret = menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_QUERY, MENU_ACTION_NOOP);
+   ret = menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_QUERY);
 
 end:
    if (conf)
@@ -127,7 +127,7 @@ static int deferred_push_cursor_manager_list_deferred_query_subsearch(menu_displ
    strlcpy(info->path_b,    str_list->elems[0].data, sizeof(info->path_b));
    strlcpy(info->path_c,    query, sizeof(info->path_c));
 
-   ret = menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_QUERY, MENU_ACTION_NOOP);
+   ret = menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_QUERY);
 
 end:
    if (str_list)
@@ -138,93 +138,93 @@ end:
 
 static int deferred_push_video_shader_preset_parameters(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_SHADER_PARAMETERS_PRESET, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_SHADER_PARAMETERS_PRESET);
 }
 
 static int deferred_push_video_shader_parameters(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_SHADER_PARAMETERS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_SHADER_PARAMETERS);
 }
 
 static int deferred_push_settings(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_SETTINGS_ALL, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_SETTINGS_ALL);
 }
 
 static int deferred_push_settings_subgroup(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_SETTINGS_SUBGROUP, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_SETTINGS_SUBGROUP);
 }
 
 static int deferred_push_category(menu_displaylist_info_t *info)
 {
 
-   return menu_displaylist_push_list(info, DISPLAYLIST_SETTINGS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_SETTINGS);
 }
 
 static int deferred_push_shader_options(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_SHADERS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_SHADERS);
 }
 
 static int deferred_push_options(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS);
 }
 
 static int deferred_push_content_settings(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CONTENT_SETTINGS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CONTENT_SETTINGS);
 }
 
 static int deferred_push_add_content_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_ADD_CONTENT_LIST, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_ADD_CONTENT_LIST);
 }
 
 static int deferred_push_load_content_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_LOAD_CONTENT_LIST, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_LOAD_CONTENT_LIST);
 }
 
 static int deferred_push_information_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_INFORMATION_LIST, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_INFORMATION_LIST);
 }
 
 static int deferred_push_management_options(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_MANAGEMENT, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_MANAGEMENT);
 }
 
 static int deferred_push_core_counters(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_PERFCOUNTERS_CORE, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_PERFCOUNTERS_CORE);
 }
 
 static int deferred_push_frontend_counters(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_PERFCOUNTERS_FRONTEND, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_PERFCOUNTERS_FRONTEND);
 }
 
 static int deferred_push_core_cheat_options(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_CHEATS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_CHEATS);
 }
 
 static int deferred_push_core_input_remapping_options(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_REMAPPINGS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_REMAPPINGS);
 }
 
 static int deferred_push_core_options(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CORE_OPTIONS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CORE_OPTIONS);
 }
 
 static int deferred_push_disk_options(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_DISK, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_OPTIONS_DISK);
 }
 
 #ifdef HAVE_NETWORKING
@@ -273,23 +273,23 @@ int cb_core_content_list(void *data_, size_t len)
 
 static int deferred_push_core_updater_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CORES_UPDATER, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CORES_UPDATER);
 }
 
 static int deferred_push_core_content_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CORE_CONTENT, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CORE_CONTENT);
 }
 #endif
 
 static int deferred_archive_action_detect_core(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_ARCHIVE_ACTION_DETECT_CORE);
 }
 
 static int deferred_archive_action(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_ARCHIVE_ACTION, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_ARCHIVE_ACTION);
 }
 
 enum
@@ -395,7 +395,7 @@ static int general_push(menu_displaylist_info_t *info, unsigned id, unsigned typ
 #endif
    }
 
-   return menu_displaylist_push_list(info, type, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, type);
 }
 
 static int deferred_push_detect_core_list(menu_displaylist_info_t *info)
@@ -420,7 +420,7 @@ static int deferred_push_default(menu_displaylist_info_t *info)
 
 static int deferred_push_history_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_HISTORY, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_HISTORY);
 }
 
 int deferred_push_content_list(void *data, void *userdata, const char *path,
@@ -432,87 +432,87 @@ int deferred_push_content_list(void *data, void *userdata, const char *path,
 
 static int deferred_push_database_manager_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASES, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASES);
 }
 
 static int deferred_push_cursor_manager_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_CURSORS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_CURSORS);
 }
 
 static int deferred_push_content_collection_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_PLAYLISTS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_PLAYLISTS);
 }
 
 static int deferred_push_core_list(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CORES, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CORES);
 }
 
 static int deferred_push_configurations(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CONFIG_FILES, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CONFIG_FILES);
 }
 
 static int deferred_push_video_shader_preset(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_SHADER_PRESET, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_SHADER_PRESET);
 }
 
 static int deferred_push_video_shader_pass(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_SHADER_PASS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_SHADER_PASS);
 }
 
 static int deferred_push_video_filter(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_VIDEO_FILTERS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_VIDEO_FILTERS);
 }
 
 static int deferred_push_images(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_IMAGES, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_IMAGES);
 }
 
 static int deferred_push_audio_dsp_plugin(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_AUDIO_FILTERS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_AUDIO_FILTERS);
 }
 
 static int deferred_push_cheat_file_load(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CHEAT_FILES, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CHEAT_FILES);
 }
 
 static int deferred_push_remap_file_load(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_REMAP_FILES, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_REMAP_FILES);
 }
 
 static int deferred_push_record_configfile(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_RECORD_CONFIG_FILES, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_RECORD_CONFIG_FILES);
 }
 
 static int deferred_push_input_overlay(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_OVERLAYS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_OVERLAYS);
 }
 
 static int deferred_push_input_osk_overlay(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_OVERLAYS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_OVERLAYS);
 }
 
 static int deferred_push_video_font_path(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_FONTS, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_FONTS);
 }
 
 static int deferred_push_content_history_path(menu_displaylist_info_t *info)
 {
-   return menu_displaylist_push_list(info, DISPLAYLIST_CONTENT_HISTORY, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(info, DISPLAYLIST_CONTENT_HISTORY);
 }
 
 static int menu_cbs_init_bind_deferred_push_compare_label(menu_file_list_cbs_t *cbs, 
diff --git a/menu/cbs/menu_cbs_info.c b/menu/cbs/menu_cbs_info.c
index 30a3fbad9f..44890fd5a0 100644
--- a/menu/cbs/menu_cbs_info.c
+++ b/menu/cbs/menu_cbs_info.c
@@ -34,7 +34,7 @@ static int action_info_default(unsigned type, const char *label)
          menu_hash_to_str(MENU_LABEL_INFO_SCREEN),
         sizeof(info.label));
 
-   return menu_displaylist_push_list(&info, DISPLAYLIST_HELP, MENU_ACTION_NOOP);
+   return menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
 }
 
 int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 7f7a8f2c54..b6af5f84f3 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -295,7 +295,7 @@ int generic_action_ok_displaylist_push(const char *path,
    if (info_path)
       strlcpy(info.path, info_path, sizeof(info.path));
 
-   return menu_displaylist_push_list(&info, dl_type, MENU_ACTION_OK);
+   return menu_displaylist_push_list(&info, dl_type);
 }
 
 static int rarch_defer_core_wrapper(size_t idx, size_t entry_idx, const char *path, uint32_t hash_label,
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 5a04f2ffeb..5693be167a 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1688,9 +1688,7 @@ static void xmb_init_horizontal_list(menu_handle_t *menu, xmb_handle_t *xmb)
    strlcpy(info.path, settings->playlist_directory, sizeof(info.path));
    strlcpy(info.exts, "lpl", sizeof(info.exts));
 
-   /* TODO/FIXME _ might want to do something different here other than MENU_ACTION_OK
-    * in case you want to differentiate between horizontal pushes and normal pushes */
-   menu_displaylist_push_list(&info, DISPLAYLIST_DATABASE_PLAYLISTS_HORIZONTAL, MENU_ACTION_OK);
+   menu_displaylist_push_list(&info, DISPLAYLIST_DATABASE_PLAYLISTS_HORIZONTAL);
 }
 
 static void xmb_font(menu_handle_t *menu)
@@ -2504,9 +2502,7 @@ static void xmb_toggle(bool menu_on)
 
 static int deferred_push_content_actions(menu_displaylist_info_t *info)
 {
-   /* TODO/FIXME _ might want to do something different here other than MENU_ACTION_OK
-    * in case you want to differentiate between horizontal pushes and normal pushes */
-   return menu_displaylist_push_list(info, DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS, MENU_ACTION_OK);
+   return menu_displaylist_push_list(info, DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS);
 }
 
 static int xmb_list_bind_init_compare_label(menu_file_list_cbs_t *cbs,
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 614f292f18..98d8cd15b5 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2317,8 +2317,7 @@ static void menu_driver_populate_entries(const char *path,
       driver->populate_entries(path, label, k, type);
 }
 
-int menu_displaylist_push_list(menu_displaylist_info_t *info,
-      unsigned type, unsigned action_type)
+int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
 {
    size_t i, list_size;
    int ret                     = 0;
@@ -2332,8 +2331,6 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info,
    settings_t      *settings   = config_get_ptr();
    rarch_system_info_t *system = rarch_system_info_get_ptr();
 
-   (void)action_type;
-
    switch (type)
    {
       case DISPLAYLIST_HELP_SCREEN_LIST:
@@ -2936,10 +2933,9 @@ int menu_displaylist_push(file_list_t *list, file_list_t *menu_list)
    {
       case MENU_VALUE_MAIN_MENU:
          info.flags = SL_FLAG_MAIN_MENU | SL_FLAG_MAIN_MENU_SETTINGS;
-         return menu_displaylist_push_list(&info, DISPLAYLIST_MAIN_MENU, MENU_ACTION_NOOP);
+         return menu_displaylist_push_list(&info, DISPLAYLIST_MAIN_MENU);
       case MENU_VALUE_HORIZONTAL_MENU:
-         /* TODO/FIXME - might want to do something different here other than MENU_ACTION_NOOP */
-         return menu_displaylist_push_list(&info, DISPLAYLIST_HORIZONTAL, MENU_ACTION_NOOP);
+         return menu_displaylist_push_list(&info, DISPLAYLIST_HORIZONTAL);
    }
 
    cbs = (menu_file_list_cbs_t*)
@@ -2975,7 +2971,7 @@ bool menu_displaylist_init(void *data)
 
    menu_list_push(menu_list->menu_stack,
          info.path, info.label, info.type, info.flags, 0);
-   menu_displaylist_push_list(&info, DISPLAYLIST_MAIN_MENU, MENU_ACTION_NOOP);
+   menu_displaylist_push_list(&info, DISPLAYLIST_MAIN_MENU);
    menu_navigation_clear(nav, true);
 
    return true;
diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
index 5622552c45..6c1815e2bf 100644
--- a/menu/menu_displaylist.h
+++ b/menu/menu_displaylist.h
@@ -108,7 +108,7 @@ typedef struct menu_displaylist_info
    rarch_setting_t *setting;
 } menu_displaylist_info_t;
 
-int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type, unsigned action_type);
+int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type);
 
 int menu_displaylist_push(file_list_t *list, file_list_t *menu_list);
 
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 095622eed4..1b3ca75603 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -416,7 +416,7 @@ static int menu_input_set_bind_mode_common(rarch_setting_t  *setting,
          strlcpy(info.label,
                menu_hash_to_str(MENU_LABEL_CUSTOM_BIND), sizeof(info.label));
 
-         menu_displaylist_push_list(&info, DISPLAYLIST_INFO, MENU_ACTION_OK);
+         menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
          break;
       case MENU_INPUT_BIND_ALL:
          menu_input->binds.target = &settings->input.binds
@@ -431,7 +431,7 @@ static int menu_input_set_bind_mode_common(rarch_setting_t  *setting,
                menu_hash_to_str(MENU_LABEL_CUSTOM_BIND_ALL),
                sizeof(info.label));
 
-         menu_displaylist_push_list(&info, DISPLAYLIST_INFO, MENU_ACTION_OK);
+         menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
          break;
    }
    return 0;
diff --git a/menu/menu_iterate.c b/menu/menu_iterate.c
index 8a0030344a..754989e283 100644
--- a/menu/menu_iterate.c
+++ b/menu/menu_iterate.c
@@ -273,7 +273,7 @@ static int action_iterate_menu_viewport(char *s, size_t len,
             info.type          = MENU_SETTINGS_CUSTOM_VIEWPORT;
             info.directory_ptr = nav->selection_ptr;
 
-            menu_displaylist_push_list(&info, DISPLAYLIST_INFO, MENU_ACTION_CANCEL);
+            menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
          }
          break;
 
@@ -290,7 +290,7 @@ static int action_iterate_menu_viewport(char *s, size_t len,
             info.type          = 0;
             info.directory_ptr = nav->selection_ptr;
 
-            menu_displaylist_push_list(&info, DISPLAYLIST_INFO, MENU_ACTION_OK);
+            menu_displaylist_push_list(&info, DISPLAYLIST_INFO);
          }
          break;
 
@@ -522,7 +522,7 @@ int menu_iterate(bool render_this_frame, unsigned action)
                   menu_hash_to_str(MENU_LABEL_HELP),
                   sizeof(info.label));
 
-            menu_displaylist_push_list(&info, DISPLAYLIST_HELP, MENU_ACTION_NOOP);
+            menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
          }
          break;
    }
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 4fac1fddfb..0475120ae0 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -204,7 +204,7 @@ int menu_action_handle_setting(rarch_setting_t *setting,
             strlcpy(info.path, setting->default_value.string, sizeof(info.path));
             strlcpy(info.label, setting->name, sizeof(info.label));
 
-            menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC, MENU_ACTION_OK);
+            menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
          }
          /* fall-through. */
       case ST_BOOL:
@@ -2040,7 +2040,7 @@ static void general_write_handler(void *data)
             strlcpy(info.label,
                   menu_hash_to_str(MENU_LABEL_HELP), sizeof(info.label));
 
-            menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC, MENU_ACTION_OK);
+            menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
             setting_set_with_string_representation(setting, "false");
          }
          break;