mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-09-04 23:32:18 +02:00
parent f3c24ace43
commit 8404eac60d
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
menu/cbs/menu_cbs_ok.c
View File

@ -34,15 +34,6 @@ size_t hack_shader_pass = 0;
char core_updater_path[PATH_MAX_LENGTH]; char core_updater_path[PATH_MAX_LENGTH];
#endif #endif
static int menu_action_setting_set_current_string_path(
rarch_setting_t *setting, const char *dir, const char *path)
{
char s[PATH_MAX_LENGTH];
fill_pathname_join(s, dir, path, sizeof(s));
setting_set_with_string_representation(setting, s);
return menu_setting_generic(setting, false);
}
enum enum
{ {
ACTION_OK_DL_DEFAULT = 0, ACTION_OK_DL_DEFAULT = 0,
@ -671,11 +662,16 @@ static int generic_action_ok(const char *path,
event_command(EVENT_CMD_RESUME); event_command(EVENT_CMD_RESUME);
break; break;
case ACTION_OK_SET_PATH: case ACTION_OK_SET_PATH:
flush_char = NULL;
flush_type = 49;
{ {
menu_file_list_cbs_t *cbs = menu_list_get_last_stack_actiondata(menu_list); menu_file_list_cbs_t *cbs = menu_list_get_last_stack_actiondata(menu_list);
if (cbs) if (cbs)
menu_action_setting_set_current_string_path(cbs->setting, menu_path, path); {
setting_set_with_string_representation(cbs->setting, action_path);
ret = menu_setting_generic(cbs->setting, false);
}
} }
break; break;
default: default:
@ -1006,10 +1002,7 @@ static int action_ok_file_load(const char *path,
setting = menu_setting_find(menu_label); setting = menu_setting_find(menu_label);
if (setting && setting->type == ST_PATH) if (setting && setting->type == ST_PATH)
{ return action_ok_set_path(path, label, type, idx, entry_idx);
menu_action_setting_set_current_string_path(setting, menu_path_new, path);
menu_list_pop_stack_by_needle(menu_list, setting->name);
}
else else
{ {
if (type == MENU_FILE_IN_CARCHIVE) if (type == MENU_FILE_IN_CARCHIVE)