# HG changeset patch # User eugeni # Date 1209771146 0 # Node ID 875a7878626ca8d9898daf038eeb55ad10dc7b27 # Parent 92939846ff4938aca8e9a317ee7805bd9cabf567 Move font family check to the end of the list. diff -r 92939846ff49 -r 875a7878626c libass/ass_fontconfig.c --- a/libass/ass_fontconfig.c Fri May 02 23:32:25 2008 +0000 +++ b/libass/ass_fontconfig.c Fri May 02 23:32:26 2008 +0000 @@ -140,6 +140,11 @@ 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 @@ (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);