From a8a2f87135183a12c531f847efd1ab595ed89f9a Mon Sep 17 00:00:00 2001 From: Aric Stewart Date: Tue, 31 Jan 2012 13:24:58 -0600 Subject: [PATCH] gdi32: In update_system_links if the font we are trying to link has already been substituted or localized we need to check against that name also. --- dlls/gdi32/freetype.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 37725a1959..afbc971f21 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2903,7 +2903,10 @@ static void update_system_links(void) for (i = 0; i < sizeof(font_links_defaults_list)/sizeof(font_links_defaults_list[0]); i++) { - if (!strcmpiW(font_links_defaults_list[i].shelldlg, psub->to.name)) + const FontSubst *psub2; + psub2 = get_font_subst(&font_subst_list, font_links_defaults_list[i].shelldlg, -1); + + if ((!strcmpiW(font_links_defaults_list[i].shelldlg, psub->to.name) || (psub2 && !strcmpiW(psub2->to.name,psub->to.name)))) { for (j = 0; j < sizeof(font_links_list)/sizeof(font_links_list[0]); j++) populate_system_links(hkey, font_links_list[j], font_links_defaults_list[i].substitutes); -- 2.32.0.93.g670b81a890