diff --git a/menu/menu_action.c b/menu/menu_action.c index 67c4572487..b19502adf4 100644 --- a/menu/menu_action.c +++ b/menu/menu_action.c @@ -79,24 +79,6 @@ int menu_action_set_current_string_based_on_label( return 0; } -int menu_action_setting_set_current_string_path( - rarch_setting_t *setting, const char *dir, const char *path) -{ - fill_pathname_join(setting->value.string, dir, path, setting->size); - - if (setting->change_handler) - setting->change_handler(setting); - - if (setting->flags & SD_FLAG_EXIT - && setting->cmd_trigger.triggered) - { - setting->cmd_trigger.triggered = false; - return -1; - } - - return 0; -} - static int menu_entries_action_ok_set_current_path_selection( rarch_setting_t *setting, const char *path, const char *label, unsigned type, diff --git a/menu/menu_action.h b/menu/menu_action.h index 248c471105..333d847dea 100644 --- a/menu/menu_action.h +++ b/menu/menu_action.h @@ -32,9 +32,6 @@ int menu_action_set_current_string_based_on_label( int menu_action_setting_set_current_string( rarch_setting_t *setting, const char *str); -int menu_action_setting_set_current_string_path( - rarch_setting_t *setting, const char *dir, const char *path); - int menu_action_setting_set(unsigned type, const char *label, unsigned action); diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index ec13a6b1eb..8dce28c615 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -459,6 +459,24 @@ static int action_ok_file_load_with_detect_core(const char *path, return ret; } +static int menu_action_setting_set_current_string_path( + rarch_setting_t *setting, const char *dir, const char *path) +{ + fill_pathname_join(setting->value.string, dir, path, setting->size); + + if (setting->change_handler) + setting->change_handler(setting); + + if (setting->flags & SD_FLAG_EXIT + && setting->cmd_trigger.triggered) + { + setting->cmd_trigger.triggered = false; + return -1; + } + + return 0; +} + static int action_ok_file_load(const char *path, const char *label, unsigned type, size_t idx) {