From 248205d4258c4f99c4fe4e0012147bef8001bd64 Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 17 Oct 2016 01:24:57 -0300 Subject: [PATCH] Move 'Save Core/Game Overrides' to Quick Menu --- menu/drivers/materialui.c | 6 ------ menu/drivers/xmb.c | 6 ------ menu/menu_displaylist.c | 19 +++++++++++++------ 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 9298735e05..834ebefb60 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1683,12 +1683,6 @@ static int mui_list_push(void *data, void *userdata, entry.enum_idx = MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); - entry.enum_idx = MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); - - entry.enum_idx = MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); - entry.enum_idx = MENU_ENUM_LABEL_SAVE_NEW_CONFIG; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 04dfc41d5a..b02cbfc3f1 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -3420,12 +3420,6 @@ static int xmb_list_push(void *data, void *userdata, entry.enum_idx = MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); - entry.enum_idx = MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); - - entry.enum_idx = MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); - entry.enum_idx = MENU_ENUM_LABEL_SAVE_NEW_CONFIG; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1eecd5d75f..ee7f948ced 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2714,6 +2714,19 @@ static int menu_displaylist_parse_load_content_settings( MENU_ENUM_LABEL_SHADER_OPTIONS, MENU_SETTING_ACTION, 0, 0); #endif + + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE), + msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE), + MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE, + MENU_SETTING_ACTION, 0, 0); + + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME), + msg_hash_to_str(MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME), + MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME, + MENU_SETTING_ACTION, 0, 0); + #ifdef HAVE_CHEEVOS if(settings->cheevos.enable) menu_entries_append_enum(info->list, @@ -4388,12 +4401,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG, PARSE_ACTION, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE, - PARSE_ACTION, false); - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME, - PARSE_ACTION, false); menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_SAVE_NEW_CONFIG, PARSE_ACTION, false);