Only use application font dir if library->fonts_dir is not NULL.

This can be the case if ass_set_fonts_dir() call is omitted, results in
segfault. Never happens in the current MPlayer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27126 b3059339-0415-0410-9bf9-f77b7e298cf2

diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index ccbb47086f8691372dfea600797517f934478f01..3a012f524396c9d9c0e2e62403fa56584bba4a56 100644 (file)
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -423,6 +423,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con
        for (i = 0; i < library->num_fontdata; ++i)
                process_fontdata(priv, library, ftlibrary, i);
 
+       if (dir) {
        if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse)
        {
                mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_UpdatingFontCache);
@@ -461,6 +462,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con
        if (!rc) {
                mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcConfigAppFontAddDirFailed);
        }
+       }
 
        priv->family_default = family ? strdup(family) : 0;
        priv->path_default = path ? strdup(path) : 0;