From 7d0cb7c68923e13809bb19685b0c196ccbf3348c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 11 Jun 2016 20:01:33 +0200
Subject: [PATCH] More cleanups

---
 file_path_special.c | 12 ++++++++++++
 menu/drivers/xmb.c  | 11 ++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/file_path_special.c b/file_path_special.c
index 9b3543f587..92a2dffb05 100644
--- a/file_path_special.c
+++ b/file_path_special.c
@@ -335,6 +335,18 @@ void fill_pathname_application_special(char *s, size_t len, enum application_spe
                   APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI);
             fill_pathname_join(s, s1, "Roboto-Regular.ttf", len);
          }
+#endif
+         break;
+      case APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT:
+#ifdef HAVE_XMB
+         {
+            char s1[PATH_MAX_LENGTH] = {0};
+            settings_t *settings     = config_get_ptr();
+
+            fill_pathname_application_special(s1, sizeof(s1),
+                  APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB);
+            fill_pathname_join(s, s1, "font.ttf", len);
+         }
 #endif
          break;
       case APPLICATION_SPECIAL_NONE:
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index dff932ede0..24b76a749b 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2275,18 +2275,15 @@ static void xmb_frame(void *data)
 static void xmb_font(xmb_handle_t *xmb)
 {
    menu_display_ctx_font_t font_info;
-   char themepath[PATH_MAX_LENGTH] = {0};
    char fontpath[PATH_MAX_LENGTH]  = {0};
    settings_t            *settings = config_get_ptr();
    int                   font_size = menu_display_get_font_size();
 
-   fill_pathname_application_special(themepath, sizeof(themepath),
-         APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB);
+   fill_pathname_application_special(fontpath, sizeof(fontpath),
+         APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT);
 
-   if (string_is_empty(settings->menu.xmb_font))
-         fill_pathname_join(fontpath, themepath, "font.ttf", sizeof(fontpath));
-   else
-         strlcpy(fontpath, settings->menu.xmb_font,sizeof(fontpath));
+   if (!string_is_empty(settings->menu.xmb_font))
+      strlcpy(fontpath, settings->menu.xmb_font,sizeof(fontpath));
 
    font_info.path = fontpath;
    font_info.size = font_size;