From 376317309ee264d973eaee3c47b3a8eba08ebca2 Mon Sep 17 00:00:00 2001 From: Toad King Date: Tue, 18 Dec 2012 21:12:00 -0500 Subject: [PATCH] Revert "(GX Video) Only update texture if frame is not NULL" This reverts commit 78027ee920c45f60321682d7a2bcd6f393939d12. the logic for this is already in update_textures and it broke menu rendering --- gx/gx_video.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gx/gx_video.c b/gx/gx_video.c index 309a128481..7a2e876086 100644 --- a/gx/gx_video.c +++ b/gx/gx_video.c @@ -805,7 +805,10 @@ static bool gx_frame(void *data, const void *frame, else gx->msg[0] = 0; - if (!frame && g_extern.draw_menu) + if(!frame && !g_extern.draw_menu) + return true; + + if (!frame) width = height = 4; // draw a black square in the background if(should_resize) @@ -826,9 +829,7 @@ static bool gx_frame(void *data, const void *frame, g_draw_done = false; g_current_framebuf ^= 1; - - if(frame) - update_textures(frame, width, height, pitch); + update_textures(frame, width, height, pitch); //if (frame) {