ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2019-04-23 21:15:15 +02:00
parent f8881f7cbe
commit b5a7020366
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/cbs/menu_cbs_ok.c
View File

@ -2458,10 +2458,8 @@ static int generic_action_ok_shader_preset_save(const char *path,
} }
break; break;
case ACTION_OK_SHADER_PRESET_SAVE_PARENT: case ACTION_OK_SHADER_PRESET_SAVE_PARENT:
{ fill_pathname_parent_dir_name(tmp, path_get(RARCH_PATH_BASENAME), sizeof(tmp));
fill_pathname_parent_dir_name(tmp, path_get(RARCH_PATH_BASENAME), sizeof(tmp)); fill_pathname_join(file, directory, tmp, sizeof(file));
fill_pathname_join(file, directory, tmp, sizeof(file));
}
break; break;
} }

1
retroarch.c
View File

@ -2167,7 +2167,6 @@ static bool rarch_game_specific_options(char **output)
if (!retroarch_validate_game_options(game_path, if (!retroarch_validate_game_options(game_path,
game_path_size, false)) game_path_size, false))
goto error; goto error;
if (!config_file_exists(game_path)) if (!config_file_exists(game_path))
goto error; goto error;

31
runahead/secondary_core.c
View File

@ -342,28 +342,27 @@ static void secondary_core_input_poll_null(void) { }
bool secondary_core_run_use_last_input(void) bool secondary_core_run_use_last_input(void)
{ {
if (secondary_core_ensure_exists()) if (!secondary_core_ensure_exists())
{ return false;
retro_input_poll_t old_poll_function = secondary_callbacks.poll_cb;
retro_input_state_t old_input_function = secondary_callbacks.state_cb;
secondary_callbacks.poll_cb = secondary_core_input_poll_null; retro_input_poll_t old_poll_function = secondary_callbacks.poll_cb;
secondary_callbacks.state_cb = input_state_get_last; retro_input_state_t old_input_function = secondary_callbacks.state_cb;
secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb); secondary_callbacks.poll_cb = secondary_core_input_poll_null;
secondary_core.retro_set_input_state(secondary_callbacks.state_cb); 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_core.retro_run();
secondary_callbacks.state_cb = old_input_function;
secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb); secondary_callbacks.poll_cb = old_poll_function;
secondary_core.retro_set_input_state(secondary_callbacks.state_cb); secondary_callbacks.state_cb = old_input_function;
return true; secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb);
} secondary_core.retro_set_input_state(secondary_callbacks.state_cb);
return false;
return true;
} }
bool secondary_core_deserialize(const void *buffer, int size) bool secondary_core_deserialize(const void *buffer, int size)