From 4dfe084bba35413f2610d6ff2ce213e81317e8a4 Mon Sep 17 00:00:00 2001 From: Kusanagi Kouichi Date: Tue, 20 Dec 2011 21:05:31 +0900 Subject: [PATCH] gdi32: Merge two ifs. --- dlls/gdi32/freetype.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8fe307db0ed..7c19635e61f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1587,16 +1587,14 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if(fake_family) { english_family = towstr(CP_ACP, fake_family); + localised_family = NULL; } else { english_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES); if(!english_family) english_family = towstr(CP_ACP, ft_face->family_name); - } - localised_family = NULL; - if(!fake_family) { localised_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, GetUserDefaultLCID()); if(localised_family && !strcmpiW(localised_family, english_family)) { HeapFree(GetProcessHeap(), 0, localised_family);