From 809ae0ab06e9e8b56a0886a5976b56697a68e506 Mon Sep 17 00:00:00 2001
From: ToadKing <toadking@toadking.com>
Date: Wed, 6 Mar 2013 12:19:56 -0500
Subject: [PATCH] get messages working again on android

---
 frontend/menu/rgui.c | 6 ++----
 gfx/gl.c             | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index be636e4447..5d0d0c66c8 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -569,8 +569,8 @@ static void render_text(rgui_handle_t *rgui)
       blit_line(rgui, x, y, message, i == rgui->directory_ptr);
    }
 
-   const char *message_queue;
 #ifdef GEKKO
+   const char *message_queue;
    gx_video_t *gx = (gx_video_t*)driver.video_data;
    if (rgui->msg_force)
    {
@@ -581,10 +581,8 @@ static void render_text(rgui_handle_t *rgui)
    {
       message_queue = gx->msg;
    }
-#else
-   message_queue = msg_queue_pull(g_extern.msg_queue);
-#endif
    render_messagebox(rgui, message_queue);
+#endif
 }
 
 #ifdef GEKKO
diff --git a/gfx/gl.c b/gfx/gl.c
index 92865af2cb..a62df1a0c4 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -1824,7 +1824,7 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
    if (input && input_data)
       context_input_driver_func(input, input_data);
    
-#ifndef HAVE_RMENU
+#if !defined(HAVE_RMENU) || !defined(RARCH_CONSOLE)
    // Comes too early for console - moved to gl_start
    if (g_settings.video.font_enable)
       gl->font_ctx = gl_font_init_first(gl, g_settings.video.font_path, g_settings.video.font_size);