(Menu) Change menu_parse_check

This commit is contained in:
twinaphex 2014-09-01 16:57:09 +02:00
parent d06f85ab5f
commit 17df30586c
3 changed files with 5 additions and 5 deletions

View File

@ -1471,7 +1471,7 @@ static int menu_settings_iterate(unsigned action)
file_list_get_last(driver.menu->menu_stack, &path, &label, &menu_type);
if (driver.menu->need_refresh && (menu_parse_check(menu_type) == -1))
if (driver.menu->need_refresh && (menu_parse_check(label, menu_type) == -1))
{
driver.menu->need_refresh = false;
menu_entries_push_list(driver.menu, path, label, menu_type);
@ -1779,7 +1779,7 @@ static int menu_action_ok(const char *dir, unsigned menu_type)
file_list_get_at_offset(driver.menu->selection_buf,
driver.menu->selection_ptr, &path, &label, &type);
if (menu_parse_check(type) == 0)
if (menu_parse_check(label, type) == 0)
{
char cat_path[PATH_MAX];
fill_pathname_join(cat_path, dir, path, sizeof(cat_path));

View File

@ -565,7 +565,7 @@ int menu_entries_push_list(menu_handle_t *menu,
return 0;
}
int menu_parse_check(unsigned menu_type)
int menu_parse_check(const char *label, unsigned menu_type)
{
if (!((menu_type == MENU_FILE_DIRECTORY ||
menu_common_type_is(menu_type) == MENU_SETTINGS_SHADER_OPTIONS ||
@ -597,7 +597,7 @@ int menu_parse_and_resolve(void)
)
return menu_entries_push_list(driver.menu, dir, label, menu_type);
if (menu_parse_check(menu_type) == -1)
if (menu_parse_check(label, menu_type) == -1)
return - 1;
file_list_clear(driver.menu->selection_buf);

View File

@ -24,7 +24,7 @@ void menu_entries_push(file_list_t *list,
size_t directory_ptr);
int menu_entries_push_list(menu_handle_t *menu, const char *path,
const char *label, unsigned menu_type);
int menu_parse_check(unsigned menu_type);
int menu_parse_check(const char *label, unsigned menu_type);
int menu_parse_and_resolve(void);
void menu_entries_pop(void);
void menu_flush_stack_type(unsigned final_type);