Move font family check to the end of the list.

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

diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index 0b5fd6bde1df82ff487c8e5249aa5c311b34027d..be784ff6c5c09b9b1f6750d518d2d333c1d81ffe 100644 (file)
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -140,6 +140,11 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold
                goto error;
        *index = r_index;
 
+       result = FcPatternGetString(rpat, FC_FILE, 0, &r_file);
+       if (result != FcResultMatch)
+               goto error;
+       retval = strdup((const char*)r_file);
+
        result = FcPatternGetString(rpat, FC_FAMILY, 0, &r_family);
        if (result != FcResultMatch)
                goto error;
@@ -151,11 +156,6 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold
                               (const char*)r_family, family);
        }
 
-       result = FcPatternGetString(rpat, FC_FILE, 0, &r_file);
-       if (result != FcResultMatch)
-               goto error;
-       
-       retval = strdup((const char*)r_file);
  error:
        if (pat) FcPatternDestroy(pat);
        if (fset) FcFontSetDestroy(fset);