diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c index 273d9d48b4..39b9bb2843 100644 --- a/menu/drivers/rmenu.c +++ b/menu/drivers/rmenu.c @@ -124,7 +124,6 @@ static void rmenu_render(void *data) char title[256] = {0}; char title_buf[256] = {0}; char title_msg[64] = {0}; - menu_handle_t *menu = menu_driver_get_ptr(); size_t entries_end = menu_entries_get_end(); video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count); @@ -132,9 +131,6 @@ static void rmenu_render(void *data) if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) return; - if (!menu) - return; - if (!render_normal) { render_normal = true; @@ -227,15 +223,10 @@ static void rmenu_render(void *data) static void rmenu_set_texture(void) { unsigned fb_width, fb_height; - menu_handle_t *menu = menu_driver_get_ptr(); - if (!menu) - return; if (menu_texture_inited) return; - if (!menu_texture) - return; - if (!menu_texture->pixels) + if (!menu_texture || !menu_texture->pixels) return; menu_display_ctl(MENU_DISPLAY_CTL_WIDTH, &fb_width); @@ -263,12 +254,8 @@ static void rmenu_wallpaper_set_defaults(char *s, size_t len) static void rmenu_context_reset(void) { char menu_bg[PATH_MAX_LENGTH] = {0}; - menu_handle_t *menu = menu_driver_get_ptr(); settings_t *settings = config_get_ptr(); - if (!menu) - return; - if (*settings->menu.wallpaper) strlcpy(menu_bg, settings->menu.wallpaper, sizeof(menu_bg)); else diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp index 9aac3dfc24..584d4141b7 100644 --- a/menu/drivers/rmenu_xui.cpp +++ b/menu/drivers/rmenu_xui.cpp @@ -532,15 +532,12 @@ static void rmenu_xui_render(void *data) const char *dir = NULL; const char *label = NULL; unsigned menu_type = 0; - menu_handle_t *menu = menu_driver_get_ptr(); video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count); menu_display_ctl(MENU_DISPLAY_CTL_WIDTH, &fb_width); menu_display_ctl(MENU_DISPLAY_CTL_MSG_FORCE, &msg_force); - if (!menu) - return; if ( menu_entries_needs_refresh() && menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL) diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 0dc235fba3..5d0d5a4933 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -1169,7 +1169,6 @@ static void zarch_allocate_white_texture(zui_t *zui) static void zarch_context_reset(void *data) { const char *font_path = NULL; - menu_handle_t *menu = menu_driver_get_ptr(); settings_t *settings = config_get_ptr(); zui_t *zui = (zui_t*)data;