From d4a3d90fffb2e1192ba012071d975a65b2ea1246 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 23 Jul 2016 04:36:22 +0200
Subject: [PATCH] (xmb.c) use fill_pathname_join_delim

---
 file_path_special.h | 1 +
 file_path_str.c     | 2 ++
 menu/drivers/xmb.c  | 6 +++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/file_path_special.h b/file_path_special.h
index a019a290e7..612c431a23 100644
--- a/file_path_special.h
+++ b/file_path_special.h
@@ -25,6 +25,7 @@
 enum file_path_enum
 {
    FILE_PATH_UNKNOWN = 0,
+   FILE_PATH_CONTENT_BASENAME,
    FILE_PATH_PROGRAM_NAME,
    FILE_PATH_DETECT,
    FILE_PATH_NUL,
diff --git a/file_path_str.c b/file_path_str.c
index 68f102f219..7d89989fbf 100644
--- a/file_path_str.c
+++ b/file_path_str.c
@@ -27,6 +27,8 @@ const char *file_path_str(enum file_path_enum enum_idx)
 #endif
       case FILE_PATH_DETECT:
          return "DETECT";
+      case FILE_PATH_CONTENT_BASENAME:
+         return "content.png";
       case FILE_PATH_LUTRO_PLAYLIST:
          return "Lutro.lpl";
       case FILE_PATH_NUL:
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 480378927c..e99e6e65e9 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1379,9 +1379,9 @@ static void xmb_context_reset_horizontal_list(
          image_texture_free(&ti);
       }
 
-      fill_pathname_join_concat(content_texturepath, iconpath,
-            sysname, 
-            "-content.png",
+      strlcat(iconpath, sysname, sizeof(iconpath));
+      fill_pathname_join_delim(content_texturepath, iconpath,
+            file_path_str(FILE_PATH_CONTENT_BASENAME), '-',
             sizeof(content_texturepath));
 
       if (image_texture_load(&ti, content_texturepath))