From e46e2a40c0e9f93aa69a963ef400c9a73370a00f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 23 Jun 2015 12:53:49 +0200
Subject: [PATCH] Create menu_common_push_content_settings

---
 menu/menu.c | 26 ++++++++++++++++++++++++--
 menu/menu.h |  2 ++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/menu/menu.c b/menu/menu.c
index 6d7d0aec7e..4eab2e2102 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -17,6 +17,7 @@
 #include <file/file_path.h>
 
 #include "menu.h"
+#include "menu_hash.h"
 #include "menu_display.h"
 #include "menu_entry.h"
 #include "menu_shader.h"
@@ -131,10 +132,28 @@ bool menu_load_content(enum rarch_core_type type)
    return true;
 }
 
+void menu_common_push_content_settings(void)
+{
+   menu_list_t *menu_list       = menu_list_get_ptr();
+   menu_navigation_t *nav       = menu_navigation_get_ptr();
+   menu_displaylist_info_t info = {0};
+
+   if (!menu_list)
+      return;
+
+   info.list      = menu_list->selection_buf;
+   strlcpy(info.path, menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_SETTINGS), sizeof(info.path));
+   strlcpy(info.label, menu_hash_to_str(MENU_LABEL_CONTENT_SETTINGS), sizeof(info.label));
+
+   menu_list_push(menu_list->menu_stack,
+         info.path, info.label, info.type, info.flags, 0);
+   menu_displaylist_push_list(&info, DISPLAYLIST_CONTENT_SETTINGS);
+}
+
 void menu_common_load_content(bool persist, enum rarch_core_type type)
 {
-   menu_display_t *disp   = menu_display_get_ptr();
-   menu_list_t *menu_list = menu_list_get_ptr();
+   menu_display_t *disp         = menu_display_get_ptr();
+   menu_list_t *menu_list       = menu_list_get_ptr();
    if (!menu_list)
       return;
 
@@ -153,8 +172,11 @@ void menu_common_load_content(bool persist, enum rarch_core_type type)
 
    menu_list_flush_stack(menu_list, NULL, MENU_SETTINGS);
    disp->msg_force = true;
+
+   menu_common_push_content_settings();
 }
 
+
 static int menu_init_entries(menu_entries_t *entries)
 {
    if (!(entries->menu_list = (menu_list_t*)menu_list_new()))
diff --git a/menu/menu.h b/menu/menu.h
index 0ee06bf5f8..b617323a4d 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -192,6 +192,8 @@ bool menu_load_content(enum rarch_core_type type);
 
 void menu_common_load_content(bool persist, enum rarch_core_type type);
 
+void menu_common_push_content_settings(void);
+
 void menu_update_system_info(menu_handle_t *menu, bool *load_no_content);
 
 #ifdef __cplusplus