CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 11:18:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1669 from heuripedes/master

Browse Source 
Fix sigsegv and improve font fallback logic
This commit is contained in:
Twinaphex 2015-05-03 03:28:28 +02:00
commit 42d044a51f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/font_driver.c
View File

@ -87,6 +87,9 @@ bool font_init_first(const void **font_driver, void **font_handle,
void *video_data, const char *font_path, float font_size,
enum font_driver_render_api api)
{
if (font_path && !font_path[0])
font_path = NULL;
switch (api)
{
#ifdef HAVE_D3D

3
menu/menu_display.c
View File

@ -179,9 +179,6 @@ bool menu_display_init_main_font(menu_handle_t *menu,
if (menu->font.buf)
menu_display_free_main_font(menu);
if (!font_path[0])
font_path = NULL;
result = menu_display_font_init_first(
(const void**)&driver->font_osd_driver, &menu->font.buf, video,
font_path, font_size);