This commit is contained in:
twinaphex 2015-12-10 18:49:26 +01:00
parent 8ef1e9c0b0
commit ae995f6986
3 changed files with 1 additions and 18 deletions

View File

@ -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

View File

@ -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)

View File

@ -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;