From f4d0b12288eb0d5e90a4b503d1e0ef3a519bb33b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 22 Jan 2015 23:17:17 +0100 Subject: [PATCH] (menu_entries_cbs.c) Cut down on code duplication --- menu/menu_entries_cbs.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index fde4dff45c..5dfebc98a1 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -244,19 +244,11 @@ static int action_ok_shader_pass(const char *path, idx); } -static int action_ok_shader_preset_parameters(const char *path, - const char *label, unsigned type, size_t idx) -{ - return action_ok_file_generic( - "", "video_shader_preset_parameters", - MENU_SETTING_ACTION, idx); -} - static int action_ok_shader_parameters(const char *path, const char *label, unsigned type, size_t idx) { return action_ok_file_generic( - "", "video_shader_parameters", + "", label, MENU_SETTING_ACTION, idx); } @@ -2784,10 +2776,10 @@ static void menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, cbs->action_ok = action_ok_cheat_file; else if (!strcmp(label, "remap_file_load")) cbs->action_ok = action_ok_remap_file; - else if (!strcmp(label, "video_shader_parameters")) + else if (!strcmp(label, "video_shader_parameters") || + !strcmp(label, "video_shader_preset_parameters") + ) cbs->action_ok = action_ok_shader_parameters; - else if (!strcmp(label, "video_shader_preset_parameters")) - cbs->action_ok = action_ok_shader_preset_parameters; else if ( !strcmp(label, "Shader Options") || !strcmp(label, "Input Options") ||