CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-27 06:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-06-11 20:21:22 +02:00
parent deda6fdf01
commit 1e13cb9c69
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
file_path_special.c
View File

@ -34,6 +34,7 @@
#endif #endif
#include <file/file_path.h> #include <file/file_path.h>
#include <string/stdstring.h>
#include <compat/strl.h> #include <compat/strl.h>
#include <compat/posix_string.h> #include <compat/posix_string.h>
@ -288,7 +289,7 @@ void fill_pathname_application_special(char *s, size_t len, enum application_spe
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (*settings->path.menu_wallpaper) if (!string_is_empty(settings->path.menu_wallpaper))
strlcpy(s, settings->path.menu_wallpaper, len); strlcpy(s, settings->path.menu_wallpaper, len);
else else
{ {
@ -356,10 +357,15 @@ void fill_pathname_application_special(char *s, size_t len, enum application_spe
#ifdef HAVE_XMB #ifdef HAVE_XMB
{ {
char s1[PATH_MAX_LENGTH] = {0}; char s1[PATH_MAX_LENGTH] = {0};
settings_t *settings = config_get_ptr();
fill_pathname_application_special(s1, sizeof(s1), fill_pathname_application_special(s1, sizeof(s1),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB); APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB);
fill_pathname_join(s, s1, "font.ttf", len);
if (!string_is_empty(settings->menu.xmb_font))
strlcpy(s, settings->menu.xmb_font, len);
else
fill_pathname_join(s, s1, "font.ttf", len);
} }
#endif #endif
break; break;

3
menu/drivers/xmb.c
View File

@ -2266,9 +2266,6 @@ static void xmb_font(xmb_handle_t *xmb)
fill_pathname_application_special(fontpath, sizeof(fontpath), fill_pathname_application_special(fontpath, sizeof(fontpath),
APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT); APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB_FONT);
if (!string_is_empty(settings->menu.xmb_font))
strlcpy(fontpath, settings->menu.xmb_font,sizeof(fontpath));
font_info.path = fontpath; font_info.path = fontpath;
font_info.size = font_size; font_info.size = font_size;