From f8f5ca0ec843af646488ecdf4edc99109d5dab3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
Date: Thu, 2 Apr 2015 20:12:18 -0300
Subject: [PATCH] (GLUI,XMB) Fix messagebox rendering

---
 menu/drivers/glui.c | 12 ++++++------
 menu/drivers/xmb.c  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index eb02af37eb..3e8c0c6275 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -467,6 +467,12 @@ static void glui_frame(void)
 
 draw_text:
 
+   if (glui->use_blocks)
+   {
+      font_driver->flush(gl->font_handle);
+      font_driver->bind_block(gl->font_handle, NULL);
+   }
+
    if (menu->keyboard.display)
    {
       char msg[PATH_MAX_LENGTH];
@@ -485,12 +491,6 @@ draw_text:
       glui->box_message[0] = '\0';
    }
 
-   if (glui->use_blocks)
-   {
-      font_driver->flush(gl->font_handle);
-      font_driver->bind_block(gl->font_handle, NULL);
-   }
-
    if (settings->menu.mouse.enable)
       glui_draw_cursor(gl, menu->mouse.x, menu->mouse.y);
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 303ebb7176..a2a85d3b54 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1366,6 +1366,12 @@ static void xmb_frame(void)
       }
    }
 
+   if (font_driver->flush)
+   {
+      font_driver->flush(xmb->font.buf);
+      font_driver->bind_block(xmb->font.buf, NULL);
+   }
+
    if (menu->keyboard.display)
    {
       const char *str = *menu->keyboard.buffer;
@@ -1391,12 +1397,6 @@ static void xmb_frame(void)
       xmb_frame_messagebox(msg);
    }
 
-   if (font_driver->flush)
-   {
-      font_driver->flush(xmb->font.buf);
-      font_driver->bind_block(xmb->font.buf, NULL);
-   }
-
    if (settings->menu.mouse.enable)
       xmb_draw_cursor(gl, xmb, menu->mouse.x, menu->mouse.y);