From aab2d2015160c4baac7133d7aa1a04d382908cc3 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sat, 5 Oct 2013 17:12:27 +0200
Subject: [PATCH] Some display tweaks.

---
 frontend/menu/rgui.c            |  2 +-
 frontend/menu/rguidisp_bitmap.c | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index 2c2cecf113..b47e95dd47 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -291,7 +291,7 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui)
       rgui_list_push(rgui->selection_buf, "Load Game (History)", RGUI_SETTINGS_OPEN_HISTORY, 0);
 
    if (rgui->core_info)
-      rgui_list_push(rgui->selection_buf, "Load Game (Autodetect Core)", RGUI_SETTINGS_OPEN_FILEBROWSER_DEFERRED_CORE, 0);
+      rgui_list_push(rgui->selection_buf, "Load Game (Detect Core)", RGUI_SETTINGS_OPEN_FILEBROWSER_DEFERRED_CORE, 0);
 
    if (rgui->info.library_name || g_extern.system.info.library_name)
    {
diff --git a/frontend/menu/rguidisp_bitmap.c b/frontend/menu/rguidisp_bitmap.c
index dae7c08f0c..7c3c5b3c12 100644
--- a/frontend/menu/rguidisp_bitmap.c
+++ b/frontend/menu/rguidisp_bitmap.c
@@ -293,13 +293,17 @@ static void render_text(rgui_handle_t *rgui)
       snprintf(title, sizeof(title), "SYSTEM DIR %s", dir);
    else
    {
-      const char *core_name = rgui->info.library_name;
-      if (!core_name)
-         core_name = g_extern.system.info.library_name;
-      if (!core_name)
-         core_name = "No Core";
-
-      snprintf(title, sizeof(title), "GAME (%s) %s", core_name, dir);
+      if (rgui->defer_core)
+         snprintf(title, sizeof(title), "GAME %s", dir);
+      else
+      {
+         const char *core_name = rgui->info.library_name;
+         if (!core_name)
+            core_name = g_extern.system.info.library_name;
+         if (!core_name)
+            core_name = "No Core";
+         snprintf(title, sizeof(title), "GAME (%s) %s", core_name, dir);
+      }
    }
 
    char title_buf[256];