diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 51982f59ec..301a7b8853 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -224,18 +224,6 @@ void menu_driver_list_free(file_list_t *list, size_t idx, size_t list_size) file_list_free_actiondata(list, idx); } -void menu_driver_list_clear(file_list_t *list) -{ - const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); - unsigned i; - - if (driver->list_clear) - driver->list_clear(list); - - for (i = 0; i < list->size; i++) - file_list_free_actiondata(list, i); -} - void menu_driver_context_destroy(void) { const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 53b6399c21..dd7c3760bf 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -212,8 +212,6 @@ void menu_driver_list_cache(menu_list_type_t type, unsigned action); void menu_driver_list_free(file_list_t *list, size_t i, size_t list_size); -void menu_driver_list_clear(file_list_t *list); - size_t menu_driver_list_get_size(menu_list_type_t type); void menu_driver_list_set_selection(file_list_t *list); diff --git a/menu/menu_list.c b/menu/menu_list.c index 344a7708d3..e2a2e41df4 100644 --- a/menu/menu_list.c +++ b/menu/menu_list.c @@ -239,7 +239,14 @@ void menu_list_pop(file_list_t *list, size_t *directory_ptr) void menu_list_clear(file_list_t *list) { - menu_driver_list_clear(list); + unsigned i; + const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); + + if (driver->list_clear) + driver->list_clear(list); + + for (i = 0; i < list->size; i++) + file_list_free_actiondata(list, i); if (list) file_list_clear(list);