diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 737b00b8dd..9d595d1ee0 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -290,6 +290,7 @@ static int playlist_association_left(unsigned type, const char *label, { unsigned i; int next, found, current = 0; + core_info_t *info = NULL; struct string_list *stnames = NULL; struct string_list *stcores = NULL; char core_path[PATH_MAX_LENGTH] = {0}; @@ -323,8 +324,7 @@ static int playlist_association_left(unsigned type, const char *label, next = 0; } - core_info_t *info = core_info_get(list, next); - + info = core_info_get(list, next); found = string_list_find_elem(stnames, path); if (found) string_list_set(stcores, found-1, info->path); diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 319c65f30e..82d7ad3306 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -314,6 +314,7 @@ static int playlist_association_right(unsigned type, const char *label, { size_t i, next, found, current = 0; char core_path[PATH_MAX_LENGTH] = {0}; + core_info_t *info = NULL; struct string_list *stnames = NULL; struct string_list *stcores = NULL; char new_playlist_cores[PATH_MAX_LENGTH] = {0}; @@ -346,7 +347,7 @@ static int playlist_association_right(unsigned type, const char *label, next = 0; } - core_info_t *info = core_info_get(list, next); + info = core_info_get(list, next); found = string_list_find_elem(stnames, path); if (found) diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index 1c6f96fd76..a3803b923e 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -270,6 +270,8 @@ static int action_start_playlist_association(unsigned type, const char *label) { int found; char new_playlist_cores[PATH_MAX_LENGTH] = {0}; + struct string_list *stnames = NULL; + struct string_list *stcores = NULL; global_t *global = global_get_ptr(); settings_t *settings = config_get_ptr(); const char *path = path_basename(label); @@ -277,10 +279,10 @@ static int action_start_playlist_association(unsigned type, const char *label) if (!list) return -1; - struct string_list *stnames = string_split(settings->playlist_names, ";"); - struct string_list *stcores = string_split(settings->playlist_cores, ";"); + stnames = string_split(settings->playlist_names, ";"); + stcores = string_split(settings->playlist_cores, ";"); + found = string_list_find_elem(stnames, path); - found = string_list_find_elem(stnames, path); if (found) string_list_set(stcores, found-1, "DETECT"); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 0e82f605ee..3cfa1a1992 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -1302,8 +1302,9 @@ bool START_SUB_GROUP(rarch_setting_t **list, rarch_setting_group_info_t *subgroup_info, const char *parent_group) { + rarch_setting_t value; subgroup_info->name = name; - rarch_setting_t value = setting_subgroup_setting (ST_SUB_GROUP, name, group_info->name, parent_group); + value = setting_subgroup_setting (ST_SUB_GROUP, name, group_info->name, parent_group); if (!(menu_settings_list_append(list, list_info, value))) return false; return true;