From f273b34f7345d33a0f53d165ba83efff30af433f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 30 Sep 2014 21:29:28 +0200
Subject: [PATCH] deinit_msg_queue becomes static function - clean it up in
 rarch_main_state_free

---
 frontend/frontend.c | 2 --
 general.h           | 1 -
 retroarch.c         | 4 ++--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/frontend.c b/frontend/frontend.c
index 19c9a05c75..0623f9beb5 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -104,8 +104,6 @@ void main_exit(args_type() args)
       rarch_main_deinit();
    }
 
-   rarch_deinit_msg_queue();
-
    rarch_perf_log();
 
 #if defined(HAVE_LOGGER) && !defined(ANDROID)
diff --git a/general.h b/general.h
index 851aca0b7a..5b6448703d 100644
--- a/general.h
+++ b/general.h
@@ -806,7 +806,6 @@ void rarch_main_command(unsigned action);
 bool rarch_main_iterate(void);
 void rarch_main_deinit(void);
 void rarch_render_cached_frame(void);
-void rarch_deinit_msg_queue(void);
 void rarch_check_block_hotkey(bool pressed);
 bool rarch_check_fullscreen(bool pressed);
 void rarch_disk_control_set_eject(bool state, bool log);
diff --git a/retroarch.c b/retroarch.c
index 1cf7db59c1..7694c13493 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1255,7 +1255,7 @@ static void init_msg_queue(void)
       rarch_assert(g_extern.msg_queue = msg_queue_new(8));
 }
 
-void rarch_deinit_msg_queue(void)
+static void deinit_msg_queue(void)
 {
    if (g_extern.msg_queue)
       msg_queue_free(g_extern.msg_queue);
@@ -2568,11 +2568,11 @@ void rarch_main_state_new(void)
 
 void rarch_main_state_free(void)
 {
+   deinit_msg_queue();
    deinit_log_file();
 
    main_clear_state(false);
 
-   rarch_deinit_msg_queue();
 }
 
 #ifdef HAVE_ZLIB