From c8b83de31c6ec6bb1ce241ea1acbe54bc0cfc6da Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 22 Sep 2015 22:43:49 +0200
Subject: [PATCH] Move ui companion msg_queue_push call to runloop_msg

---
 menu/menu_display.c | 8 --------
 runloop_msg.c       | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/menu/menu_display.c b/menu/menu_display.c
index 8ffc3a0c65..6b79ca6a3b 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -290,13 +290,5 @@ void menu_display_timedate(char *s, size_t len, unsigned time_mode)
 void menu_display_msg_queue_push(const char *msg, unsigned prio, unsigned duration,
       bool flush)
 {
-
    rarch_main_msg_queue_push(msg, prio, duration, flush);
-
-   if (ui_companion_is_on_foreground())
-   {
-      const ui_companion_driver_t *ui = ui_companion_get_ptr();
-      if (ui->msg_queue_push)
-         ui->msg_queue_push(msg, prio, duration, flush);
-   }
 }
diff --git a/runloop_msg.c b/runloop_msg.c
index 87906d18a8..1bc3f7534f 100644
--- a/runloop_msg.c
+++ b/runloop_msg.c
@@ -73,6 +73,13 @@ void rarch_main_msg_queue_push(const char *msg, unsigned prio, unsigned duration
       msg_queue_clear(g_msg_queue);
    msg_queue_push(g_msg_queue, msg, prio, duration);
 
+   if (ui_companion_is_on_foreground())
+   {
+      const ui_companion_driver_t *ui = ui_companion_get_ptr();
+      if (ui->msg_queue_push)
+         ui->msg_queue_push(msg, prio, duration, flush);
+   }
+
 #ifdef HAVE_THREADS
    slock_unlock(mq_lock);
 #endif