Move core options to deferred push callback

This commit is contained in:
twinaphex 2014-10-15 20:52:02 +02:00
parent 110d802319
commit a7c49cc3dc
2 changed files with 16 additions and 1 deletions

View File

@ -741,7 +741,6 @@ static int menu_parse_check(const char *label, unsigned menu_type)
!strcmp(label, "performance_counters") ||
!strcmp(label, "core_counters") ||
!strcmp(label, "frontend_counters") ||
!strcmp(label, "core_options") ||
!strcmp(label, "Input Options") ||
!strcmp(label, "Shader Options") ||
!strcmp(label, "video_shader_preset_parameters") ||

View File

@ -1338,6 +1338,20 @@ static int deferred_push_core_information(void *data, void *userdata,
return 0;
}
static int deferred_push_core_options(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
file_list_t *list = (file_list_t*)data;
file_list_t *menu_list = (file_list_t*)userdata;
if (!list || !menu_list)
return -1;
return push_list(driver.menu, list, path, label, type);
return 0;
}
static int deferred_push_disk_options(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
@ -1804,6 +1818,8 @@ static void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
cbs->action_deferred_push = deferred_push_core_list_deferred;
else if (!strcmp(label, "core_information"))
cbs->action_deferred_push = deferred_push_core_information;
else if (!strcmp(label, "core_options"))
cbs->action_deferred_push = deferred_push_core_options;
else if (!strcmp(label, "disk_options"))
cbs->action_deferred_push = deferred_push_disk_options;
else if (!strcmp(label, "core_list"))