From b5a7020366b675c3f09ee36d480594d83115eb8d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 23 Apr 2019 21:15:15 +0200 Subject: [PATCH] Cleanups --- menu/cbs/menu_cbs_ok.c | 6 ++---- retroarch.c | 1 - runahead/secondary_core.c | 31 +++++++++++++++---------------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index f0278fe870..742cf5a039 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -2458,10 +2458,8 @@ static int generic_action_ok_shader_preset_save(const char *path, } break; case ACTION_OK_SHADER_PRESET_SAVE_PARENT: - { - fill_pathname_parent_dir_name(tmp, path_get(RARCH_PATH_BASENAME), sizeof(tmp)); - fill_pathname_join(file, directory, tmp, sizeof(file)); - } + fill_pathname_parent_dir_name(tmp, path_get(RARCH_PATH_BASENAME), sizeof(tmp)); + fill_pathname_join(file, directory, tmp, sizeof(file)); break; } diff --git a/retroarch.c b/retroarch.c index a33341e22e..136367b7ac 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2167,7 +2167,6 @@ static bool rarch_game_specific_options(char **output) if (!retroarch_validate_game_options(game_path, game_path_size, false)) goto error; - if (!config_file_exists(game_path)) goto error; diff --git a/runahead/secondary_core.c b/runahead/secondary_core.c index 632ae1ba40..a552851b9c 100644 --- a/runahead/secondary_core.c +++ b/runahead/secondary_core.c @@ -342,28 +342,27 @@ static void secondary_core_input_poll_null(void) { } bool secondary_core_run_use_last_input(void) { - if (secondary_core_ensure_exists()) - { - retro_input_poll_t old_poll_function = secondary_callbacks.poll_cb; - retro_input_state_t old_input_function = secondary_callbacks.state_cb; + if (!secondary_core_ensure_exists()) + return false; - secondary_callbacks.poll_cb = secondary_core_input_poll_null; - secondary_callbacks.state_cb = input_state_get_last; + retro_input_poll_t old_poll_function = secondary_callbacks.poll_cb; + retro_input_state_t old_input_function = secondary_callbacks.state_cb; - secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb); - secondary_core.retro_set_input_state(secondary_callbacks.state_cb); + secondary_callbacks.poll_cb = secondary_core_input_poll_null; + secondary_callbacks.state_cb = input_state_get_last; - secondary_core.retro_run(); + secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb); + secondary_core.retro_set_input_state(secondary_callbacks.state_cb); - secondary_callbacks.poll_cb = old_poll_function; - secondary_callbacks.state_cb = old_input_function; + secondary_core.retro_run(); - secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb); - secondary_core.retro_set_input_state(secondary_callbacks.state_cb); + secondary_callbacks.poll_cb = old_poll_function; + secondary_callbacks.state_cb = old_input_function; - return true; - } - return false; + secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb); + secondary_core.retro_set_input_state(secondary_callbacks.state_cb); + + return true; } bool secondary_core_deserialize(const void *buffer, int size)