From cb2e898d8c82fd12c9165aa997805f255a758803 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 19 May 2017 15:31:14 +0200
Subject: [PATCH] Cleanups

---
 menu/menu_driver.c | 54 ++++++++++++++++------------------------------
 menu/menu_driver.h |  5 -----
 2 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 7bef8e796c..50a688a673 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -320,38 +320,6 @@ bool menu_display_font_flush_block(unsigned width, unsigned height,
    return true;
 }
 
-void menu_display_framebuffer_deinit(void)
-{
-   menu_display_framebuf_width  = 0;
-   menu_display_framebuf_height = 0;
-   menu_display_framebuf_pitch  = 0;
-}
-
-void menu_display_deinit(void)
-{
-   if (menu_display_msg_queue)
-      msg_queue_free(menu_display_msg_queue);
-
-   video_coord_array_free(&menu_disp_ca);
-   menu_display_msg_queue       = NULL;
-   menu_display_msg_force       = false;
-   menu_display_header_height   = 0;
-   menu_disp                    = NULL;
-   menu_display_has_windowed    = false;
-
-   menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
-   menu_display_framebuffer_deinit();
-}
-
-bool menu_display_init(void)
-{
-   menu_display_msg_queue    = msg_queue_new(8);
-   menu_disp_ca.allocated    =  0;
-
-   menu_display_has_windowed = video_driver_has_windowed();
-   return true;
-}
-
 void menu_display_coords_array_reset(void)
 {
    menu_disp_ca.coords.vertices = 0;
@@ -1420,8 +1388,10 @@ static bool menu_init(menu_handle_t *menu_data)
 
    menu_shader_manager_init();
 
-   if (!menu_display_init())
-      return false;
+   menu_display_msg_queue    = msg_queue_new(8);
+   menu_disp_ca.allocated    =  0;
+
+   menu_display_has_windowed = video_driver_has_windowed();
 
    return true;
 }
@@ -1884,7 +1854,21 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
             menu_userdata = NULL;
 
             menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
-            menu_display_deinit();
+            if (menu_display_msg_queue)
+               msg_queue_free(menu_display_msg_queue);
+
+            video_coord_array_free(&menu_disp_ca);
+            menu_display_msg_queue       = NULL;
+            menu_display_msg_force       = false;
+            menu_display_header_height   = 0;
+            menu_disp                    = NULL;
+            menu_display_has_windowed    = false;
+
+            menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
+
+            menu_display_framebuf_width  = 0;
+            menu_display_framebuf_height = 0;
+            menu_display_framebuf_pitch  = 0;
             menu_entries_ctl(MENU_ENTRIES_CTL_DEINIT, NULL);
 
             command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index a4efa5db57..2b6e747ae3 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -596,11 +596,6 @@ void menu_display_font_free(font_data_t *font);
 void menu_display_font_bind_block(font_data_t *font, void *block);
 bool menu_display_font_flush_block(unsigned width, unsigned height, font_data_t *font);
 
-void menu_display_framebuffer_deinit(void);
-
-void menu_display_deinit(void);
-bool menu_display_init(void);
-
 void menu_display_coords_array_reset(void);
 video_coord_array_t *menu_display_get_coords_array(void);
 const uint8_t *menu_display_get_font_framebuffer(void);