From 8833ba1141fba12cd9a799e315b76a1f08afa2da Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 12 Dec 2015 23:48:44 +0100
Subject: [PATCH] Create MENU_DISPLAY_CTL_FONT_FLUSH_BLOCK

---
 menu/drivers/materialui.c |  3 +--
 menu/drivers/xmb.c        |  3 +--
 menu/drivers/zarch.c      |  3 +--
 menu/menu_display.c       | 19 ++++++++-----------
 menu/menu_display.h       |  3 +--
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index c2264249d0..b73ff5502a 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -804,8 +804,7 @@ static void mui_frame(void *data)
 
    mui_render_menu_list(mui, width, height, normal_color, hover_color, &pure_white[0]);
 
-   menu_display_font_flush_block();
-
+   menu_display_ctl(MENU_DISPLAY_CTL_FONT_FLUSH_BLOCK, NULL);
    menu_animation_ctl(MENU_ANIMATION_CTL_SET_ACTIVE, NULL);
 
    /* header */
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index ebeba7a366..13afe5a1f8 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1744,8 +1744,7 @@ static void xmb_frame(void *data)
 
    xmb_frame_horizontal_list(xmb, width, height, &item_color[0]);
 
-   menu_display_font_flush_block();
-
+   menu_display_ctl(MENU_DISPLAY_CTL_FONT_FLUSH_BLOCK, NULL);
    menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_DISPLAY, &display_kb);
 
    if (display_kb)
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index fe0564861c..2a5bf99f64 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -1039,10 +1039,9 @@ static void zarch_frame(void *data)
          NULL, menu_display_get_tex_coords(), 4,
          MENU_DISPLAY_PRIM_TRIANGLESTRIP);
 
-   menu_display_font_flush_block();
-
    zui->rendering = false;
 
+   menu_display_ctl(MENU_DISPLAY_CTL_FONT_FLUSH_BLOCK, NULL);
    menu_display_ctl(MENU_DISPLAY_CTL_UNSET_VIEWPORT, NULL);
 }
 
diff --git a/menu/menu_display.c b/menu/menu_display.c
index af67f51a70..892fe4c7c8 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -135,17 +135,6 @@ bool menu_display_font_bind_block(void *userdata)
    return true;
 }
 
-bool menu_display_font_flush_block(void)
-{
-   menu_display_t *disp = menu_display_get_ptr();
-   if (!disp || !disp->font.buf)
-      return false;
-
-   font_driver_flush(disp->font.buf);
-
-   return menu_display_font_bind_block(NULL);
-}
-
 void menu_display_free_main_font(void)
 {
    menu_display_t *disp = menu_display_get_ptr();
@@ -245,6 +234,14 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
 
    switch (state)
    {
+      case MENU_DISPLAY_CTL_FONT_FLUSH_BLOCK:
+         if (!disp || !disp->font.buf)
+            return false;
+
+         font_driver_flush(disp->font.buf);
+
+         return menu_display_font_bind_block(NULL);
+         break;
       case MENU_DISPLAY_CTL_FRAMEBUF_DEINIT:
          if (menu_display_framebuf.data)
             free(menu_display_framebuf.data);
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 0a6eb802a8..428db96ae0 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -60,6 +60,7 @@ enum menu_display_ctl_state
    MENU_DISPLAY_CTL_MSG_FORCE,
    MENU_DISPLAY_CTL_SET_MSG_FORCE,
    MENU_DISPLAY_CTL_FONT_BUF,
+   MENU_DISPLAY_CTL_FONT_FLUSH_BLOCK,
    MENU_DISPLAY_CTL_SET_FONT_BUF,
    MENU_DISPLAY_CTL_FONT_FB,
    MENU_DISPLAY_CTL_SET_FONT_FB
@@ -126,8 +127,6 @@ bool menu_display_init(void);
 
 bool menu_display_font_bind_block(void *userdata);
 
-bool menu_display_font_flush_block(void);
-
 bool menu_display_init_main_font(const char *font_path, float font_size);
 
 void menu_display_free_main_font(void);