diff --git a/menu/cbs/menu_cbs_info.c b/menu/cbs/menu_cbs_info.c index 02eee4f707..6bf2b07059 100644 --- a/menu/cbs/menu_cbs_info.c +++ b/menu/cbs/menu_cbs_info.c @@ -22,10 +22,9 @@ static int action_info_default(unsigned type, const char *label) { menu_displaylist_info_t info = {0}; menu_navigation_t *nav = menu_navigation_get_ptr(); - menu_handle_t *menu = menu_driver_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); - if (!menu || !menu_list) + if (!menu_list) return 0; info.list = menu_list->menu_stack; diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 8de5488eca..4534efb20d 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -116,8 +116,8 @@ static int action_left_scroll(unsigned type, const char *label, bool wraparound) { unsigned scroll_speed = 0, fast_scroll_speed = 0; - menu_list_t *menu_list = menu_list_get_ptr(); menu_navigation_t *nav = menu_navigation_get_ptr(); + menu_list_t *menu_list = menu_list_get_ptr(); if (!nav || !menu_list) return -1; @@ -256,9 +256,6 @@ static int action_left_cheat_num_passes(unsigned type, const char *label, unsigned new_size = 0; global_t *global = global_get_ptr(); cheat_manager_t *cheat = global->cheat; - menu_handle_t *menu = menu_driver_get_ptr(); - if (!menu) - return -1; if (!cheat) return -1; diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 696bab605d..e2bd204cd5 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -145,13 +145,11 @@ static int action_right_mainmenu(unsigned type, const char *label, { menu_file_list_cbs_t *cbs = NULL; unsigned push_list = 0; - menu_list_t *menu_list = menu_list_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); + menu_list_t *menu_list = menu_list_get_ptr(); menu_navigation_t *nav = menu_navigation_get_ptr(); unsigned action = MENU_ACTION_RIGHT; size_t list_size = menu_driver_list_get_size(MENU_LIST_PLAIN); - if (!menu) - return -1; if (list_size == 1) { @@ -261,9 +259,6 @@ static int action_right_cheat_num_passes(unsigned type, const char *label, unsigned new_size = 0; global_t *global = global_get_ptr(); cheat_manager_t *cheat = global->cheat; - menu_handle_t *menu = menu_driver_get_ptr(); - if (!menu) - return -1; if (!cheat) return -1;