From a2db0bfdfaec3dbbc1d411dd275ea0636d568ce0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 26 Jan 2015 10:58:47 +0100 Subject: [PATCH] Cleanups in menu_entries_cbs_init --- menu/menu_entries_cbs.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index bd5e03462b..63247e263e 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -3717,19 +3717,17 @@ void menu_entries_cbs_init(void *data, if (!list) return; - cbs = (menu_file_list_cbs_t*)list->list[idx].actiondata; + if (!(cbs = (menu_file_list_cbs_t*)list->list[idx].actiondata)) + return; - if (cbs) - { - menu_entries_cbs_init_bind_ok(cbs, path, label, type, idx); - menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx); - menu_entries_cbs_init_bind_start(cbs, path, label, type, idx); - menu_entries_cbs_init_bind_select(cbs, path, label, type, idx); - menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx); - menu_entries_cbs_init_bind_up_or_down(cbs, path, label, type, idx); - menu_entries_cbs_init_bind_toggle(cbs, path, label, type, idx); - menu_entries_cbs_init_bind_deferred_push(cbs, path, label, type, idx); - menu_entries_cbs_init_bind_refresh(cbs, path, label, type, idx); - menu_entries_cbs_init_bind_iterate(cbs, path, label, type, idx); - } + menu_entries_cbs_init_bind_ok(cbs, path, label, type, idx); + menu_entries_cbs_init_bind_cancel(cbs, path, label, type, idx); + menu_entries_cbs_init_bind_start(cbs, path, label, type, idx); + menu_entries_cbs_init_bind_select(cbs, path, label, type, idx); + menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx); + menu_entries_cbs_init_bind_up_or_down(cbs, path, label, type, idx); + menu_entries_cbs_init_bind_toggle(cbs, path, label, type, idx); + menu_entries_cbs_init_bind_deferred_push(cbs, path, label, type, idx); + menu_entries_cbs_init_bind_refresh(cbs, path, label, type, idx); + menu_entries_cbs_init_bind_iterate(cbs, path, label, type, idx); }