diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 5482f158cf..2054171482 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -740,12 +740,14 @@ static void glui_navigation_alphabet(size_t *unused) } static void glui_populate_entries(const char *path, - const char *label, unsigned i) + const char *label, unsigned i, unsigned type) { menu_handle_t *menu = menu_driver_get_ptr(); if (!menu) return; + (void)type; + menu->scroll_y = glui_get_scroll(); } diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 75813b915b..45f929eac7 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -747,9 +747,12 @@ static void rgui_navigation_ascend_alphabet(size_t *unused) } static void rgui_populate_entries(const char *path, - const char *label, unsigned k) + const char *label, unsigned k, unsigned type) { menu_handle_t *menu = menu_driver_get_ptr(); + + (void)type; + if (menu) rgui_navigation_set(true); } diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp index c0b8f823b2..5d056acad6 100644 --- a/menu/drivers/rmenu_xui.cpp +++ b/menu/drivers/rmenu_xui.cpp @@ -603,7 +603,7 @@ static void rmenu_xui_render(void) } static void rmenu_xui_populate_entries(const char *path, - const char *label, unsigned i) + const char *label, unsigned i, unsigned type) { menu_handle_t *menu = menu_driver_get_ptr(); menu_navigation_t *nav = menu_navigation_get_ptr(); @@ -613,6 +613,7 @@ static void rmenu_xui_populate_entries(const char *path, (void)label; (void)path; + (void)type; XuiListSetCurSelVisible(m_menulist, menu_navigation_get_selection(nav)); } diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 9f13550f69..5693be167a 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1068,7 +1068,7 @@ static void xmb_list_open(xmb_handle_t *xmb) } static void xmb_populate_entries(const char *path, - const char *label, unsigned k) + const char *label, unsigned k, unsigned type) { xmb_handle_t *xmb = NULL; menu_handle_t *menu = menu_driver_get_ptr(); @@ -1076,6 +1076,8 @@ static void xmb_populate_entries(const char *path, if (!menu) return; + (void)type; + xmb = (xmb_handle_t*)menu->userdata; if (!xmb) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 51754f9c03..98d8cd15b5 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2309,12 +2309,12 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n } static void menu_driver_populate_entries(const char *path, - const char *label, unsigned k) + const char *label, unsigned k, unsigned type) { const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); if (driver->populate_entries) - driver->populate_entries(path, label, k); + driver->populate_entries(path, label, k, type); } int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) @@ -2896,7 +2896,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) if (need_refresh) menu_list_refresh(info->list); - menu_driver_populate_entries(info->path, info->label, info->type); + menu_driver_populate_entries(info->path, info->label, info->type, type); if (ui && driver) ui->notify_list_loaded(driver->ui_companion_data, diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 36825d49d7..14aad311d2 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -127,7 +127,7 @@ typedef struct menu_ctx_driver void (*context_reset)(void); void (*context_destroy)(void); void (*populate_entries)(const char *path, const char *label, - unsigned k); + unsigned k, unsigned type); void (*toggle)(bool); void (*navigation_clear)(bool); void (*navigation_decrement)(void);