From 9567db0ffeaaba48b0ec7049c0a2e3c5eb3fb4cf Mon Sep 17 00:00:00 2001
From: ToadKing <toadking@toadking.com>
Date: Sun, 13 Jan 2013 15:26:12 -0500
Subject: [PATCH] (GX) fix loading box not displaying

---
 frontend/menu/rgui.c     | 6 ++++--
 frontend/menu/rmenu_gx.c | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index 574fe4944c..24eaaa9b74 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -1121,6 +1121,7 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action)
    rgui_file_type_t menu_type = 0;
    size_t directory_ptr = 0;
    rgui_list_back(rgui->path_stack, &dir, &menu_type, &directory_ptr);
+   int ret = 0;
 
    if (menu_type == RGUI_SETTINGS || rgui_is_controller_menu(menu_type))
       return rgui_settings_iterate(rgui, action);
@@ -1214,9 +1215,10 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action)
             {
                snprintf(rgui->path_buf, sizeof(rgui->path_buf), "%s/%s", dir, path);
                console_load_game(rgui->path_buf);
+               rmenu_settings_msg(S_MSG_LOADING_ROM, S_DELAY_1);
                rgui->need_refresh = true; // in case of zip extract
                rgui->msg_force = true;
-               return -1;
+               ret = -1;
             }
          }
          break;
@@ -1266,5 +1268,5 @@ int rgui_iterate(rgui_handle_t *rgui, rgui_action_t action)
 
    render_text(rgui);
 
-   return 0;
+   return ret;
 }
diff --git a/frontend/menu/rmenu_gx.c b/frontend/menu/rmenu_gx.c
index 36ccd569a9..91270d9198 100644
--- a/frontend/menu/rmenu_gx.c
+++ b/frontend/menu/rmenu_gx.c
@@ -280,6 +280,9 @@ bool rmenu_iterate(void)
    return true;
 
 deinit:
+   // draw last frame for loading messages
+   rarch_render_cached_frame();
+
    // set a timer delay so that we don't instantly switch back to the menu when
    // press and holding QUIT in the emulation loop (lasts for 30 frame ticks)
    if (!(g_extern.lifecycle_state & (1ULL << RARCH_FRAMEADVANCE)))