From b85dfec4d40bd7e00b74cea83a14b098a9bda5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= <heuripedes@gmail.com>
Date: Sat, 2 May 2015 22:19:42 -0300
Subject: [PATCH] Fix sigsegv and improve font fallback logic

---
 gfx/font_driver.c   | 3 +++
 menu/menu_display.c | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gfx/font_driver.c b/gfx/font_driver.c
index fec2771dd5..65b2e7dc69 100644
--- a/gfx/font_driver.c
+++ b/gfx/font_driver.c
@@ -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
diff --git a/menu/menu_display.c b/menu/menu_display.c
index ffb2ddf2bf..202ce420ca 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -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);