Create menu_common_push_content_settings

This commit is contained in:
twinaphex 2015-06-23 12:53:49 +02:00
parent ba28328e8b
commit e46e2a40c0
2 changed files with 26 additions and 2 deletions

View File

@ -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()))

View File

@ -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