mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_entries_cbs.c) Implement action_ok_config_load

Browse Source
This commit is contained in:
twinaphex 2014-10-12 04:11:41 +02:00
parent aa1e56fd29
commit 3440b97b4d
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/menu/backend/menu_common_backend.c
View File

@ -825,24 +825,6 @@ static int menu_action_ok(const char *menu_path,
}
return 0;
case MENU_FILE_CONFIG:
{
char config[PATH_MAX];
fill_pathname_join(config, menu_path, path, sizeof(config));
menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS);
driver.menu->msg_force = true;
if (rarch_replace_config(config))
{
menu_clear_navigation(driver.menu);
return -1;
}
}
return 0;
case MENU_FILE_FONT:
case MENU_FILE_OVERLAY:
case MENU_FILE_AUDIOFILTER:

25
frontend/menu/menu_entries_cbs.c
View File

@ -259,6 +259,29 @@ static int action_ok_directory_push(const char *path,
return 0;
}
static int action_ok_config_load(const char *path,
const char *label, unsigned type, size_t index)
{
const char *menu_path = NULL;
char config[PATH_MAX];
if (!driver.menu)
return -1;
file_list_get_last(driver.menu->menu_stack, &menu_path, NULL, NULL);
fill_pathname_join(config, menu_path, path, sizeof(config));
menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS);
driver.menu->msg_force = true;
if (rarch_replace_config(config))
{
menu_clear_navigation(driver.menu);
return -1;
}
return 0;
}
/* Bind the OK callback function */
static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
@ -279,6 +302,8 @@ static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
cbs->action_ok = action_ok_shader_pass_load;
else if (type == MENU_FILE_USE_DIRECTORY)
cbs->action_ok = action_ok_path_use_directory;
else if (type == MENU_FILE_CONFIG)
cbs->action_ok = action_ok_config_load;
else if (type == MENU_FILE_CORE)
{
if (!strcmp(menu_label, "deferred_core_list"))