From 795b5c405f13cdea3cd33350c3fde5da0ed45d17 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 8 Mar 2015 17:19:46 +0100 Subject: [PATCH] (Menu) Instrument 'start' actions like this too --- menu/menu_entries_cbs_select.c | 1 + menu/menu_entries_cbs_start.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_select.c index 8dd8a4d8c1..7575ae6b10 100644 --- a/menu/menu_entries_cbs_select.c +++ b/menu/menu_entries_cbs_select.c @@ -24,6 +24,7 @@ static int action_select_default(unsigned type, const char *label, return 0; menu_list_push_stack(menu->menu_list, "", "info_screen", 0, menu->navigation.selection_ptr); + g_runloop.frames.video.current.menu.action.active = true; return 0; } diff --git a/menu/menu_entries_cbs_start.c b/menu/menu_entries_cbs_start.c index 7b30f4d529..769c6d89dc 100644 --- a/menu/menu_entries_cbs_start.c +++ b/menu/menu_entries_cbs_start.c @@ -29,6 +29,7 @@ static int action_start_remap_file_load(unsigned type, const char *label, { g_settings.input.remapping_path[0] = '\0'; input_remapping_set_defaults(); + g_runloop.frames.video.current.menu.action.active = true; return 0; } @@ -37,6 +38,7 @@ static int action_start_video_filter_file_load(unsigned type, const char *label, { g_settings.video.softfilter_plugin[0] = '\0'; rarch_main_command(RARCH_CMD_REINIT); + g_runloop.frames.video.current.menu.action.active = true; return 0; } @@ -54,6 +56,7 @@ static int action_start_performance_counters_core(unsigned type, const char *lab { counters[offset]->total = 0; counters[offset]->call_cnt = 0; + g_runloop.frames.video.current.menu.action.active = true; } return 0; @@ -71,6 +74,7 @@ static int action_start_input_desc(unsigned type, const char *label, g_settings.input.remap_ids[inp_desc_user][inp_desc_button_index_offset] = g_settings.input.binds[inp_desc_user][inp_desc_button_index_offset].id; + g_runloop.frames.video.current.menu.action.active = true; return 0; } @@ -88,6 +92,8 @@ static int action_start_shader_action_parameter(unsigned type, const char *label param = &shader->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0]; param->current = param->initial; param->current = min(max(param->minimum, param->current), param->maximum); + + g_runloop.frames.video.current.menu.action.active = true; #endif return 0; @@ -109,6 +115,8 @@ static int action_start_shader_action_preset_parameter(unsigned type, const char param = &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0]; param->current = param->initial; param->current = min(max(param->minimum, param->current), param->maximum); + + g_runloop.frames.video.current.menu.action.active = true; #endif return 0; @@ -132,6 +140,8 @@ static int action_start_shader_pass(unsigned type, const char *label, if (shader_pass) *shader_pass->source.path = '\0'; + + g_runloop.frames.video.current.menu.action.active = true; #endif return 0; @@ -159,6 +169,7 @@ static int action_start_shader_scale_pass(unsigned type, const char *label, { shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = 0; shader_pass->fbo.valid = false; + g_runloop.frames.video.current.menu.action.active = true; } } #endif @@ -185,6 +196,7 @@ static int action_start_shader_filter_pass(unsigned type, const char *label, return -1; shader_pass->filter = RARCH_FILTER_UNSPEC; + g_runloop.frames.video.current.menu.action.active = true; #endif return 0; @@ -207,6 +219,7 @@ static int action_start_shader_num_passes(unsigned type, const char *label, menu->need_refresh = true; video_shader_resolve_parameters(NULL, menu->shader); + g_runloop.frames.video.current.menu.action.active = true; #endif return 0; } @@ -226,6 +239,7 @@ static int action_start_cheat_num_passes(unsigned type, const char *label, { cheat_manager_realloc(cheat, 0); menu->need_refresh = true; + g_runloop.frames.video.current.menu.action.active = true; } return 0; @@ -244,6 +258,7 @@ static int action_start_performance_counters_frontend(unsigned type, const char { counters[offset]->total = 0; counters[offset]->call_cnt = 0; + g_runloop.frames.video.current.menu.action.active = true; } return 0; @@ -257,6 +272,7 @@ static int action_start_core_setting(unsigned type, (void)label; core_option_set_default(g_extern.system.core_options, idx); + g_runloop.frames.video.current.menu.action.active = true; return 0; } @@ -264,7 +280,10 @@ static int action_start_core_setting(unsigned type, static int action_start_lookup_setting(unsigned type, const char *label, unsigned action) { - return menu_setting_set(type, label, MENU_ACTION_START); + int ret = menu_setting_set(type, label, MENU_ACTION_START); + g_runloop.frames.video.current.menu.action.active = true; + + return ret; } void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,