generic_action_ok - cleanup

This commit is contained in:
twinaphex 2016-06-17 15:36:06 +02:00
parent a48ea15497
commit e94873727e

View File

@ -850,15 +850,11 @@ static int generic_action_ok(const char *path,
int ret = 0; int ret = 0;
const char *menu_path = NULL; const char *menu_path = NULL;
const char *flush_char = NULL; const char *flush_char = NULL;
struct video_shader *shader = NULL;
menu_handle_t *menu = NULL; menu_handle_t *menu = NULL;
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
goto error; goto error;
menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
&shader);
menu_entries_get_last_stack(&menu_path, NULL, menu_entries_get_last_stack(&menu_path, NULL,
NULL, NULL); NULL, NULL);
@ -907,18 +903,26 @@ static int generic_action_ok(const char *path,
break; break;
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
case ACTION_OK_LOAD_PRESET: case ACTION_OK_LOAD_PRESET:
flush_char = menu_hash_to_str_enum(flush_id); {
menu_shader_manager_set_preset(shader, struct video_shader *shader = NULL;
video_shader_parse_type(action_path, RARCH_SHADER_NONE), menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET, &shader);
action_path); flush_char = menu_hash_to_str_enum(flush_id);
menu_shader_manager_set_preset(shader,
video_shader_parse_type(action_path, RARCH_SHADER_NONE),
action_path);
}
break; break;
case ACTION_OK_LOAD_SHADER_PASS: case ACTION_OK_LOAD_SHADER_PASS:
flush_char = menu_hash_to_str_enum(flush_id); {
strlcpy( struct video_shader *shader = NULL;
shader->pass[hack_shader_pass].source.path, menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET, &shader);
action_path, flush_char = menu_hash_to_str_enum(flush_id);
sizeof(shader->pass[hack_shader_pass].source.path)); strlcpy(
video_shader_resolve_parameters(NULL, shader); shader->pass[hack_shader_pass].source.path,
action_path,
sizeof(shader->pass[hack_shader_pass].source.path));
video_shader_resolve_parameters(NULL, shader);
}
break; break;
#endif #endif
case ACTION_OK_LOAD_RECORD_CONFIGFILE: case ACTION_OK_LOAD_RECORD_CONFIGFILE: