Commit cfe289e6 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

gdi32: Do not report an error if a requested to add font is already loaded.

parent 82e06804
...@@ -1135,13 +1135,13 @@ static INT AddFontFileToList(const char *file, char *fake_family, const WCHAR *t ...@@ -1135,13 +1135,13 @@ static INT AddFontFileToList(const char *file, char *fake_family, const WCHAR *t
TRACE("This font is a replacement but the original really exists, so we'll skip the replacement\n"); TRACE("This font is a replacement but the original really exists, so we'll skip the replacement\n");
HeapFree(GetProcessHeap(), 0, StyleW); HeapFree(GetProcessHeap(), 0, StyleW);
pFT_Done_Face(ft_face); pFT_Done_Face(ft_face);
return 0; return 1;
} }
if(!pHeader || pHeader->Font_Revision <= face->font_version) { if(!pHeader || pHeader->Font_Revision <= face->font_version) {
TRACE("Original font is newer so skipping this one\n"); TRACE("Original font is newer so skipping this one\n");
HeapFree(GetProcessHeap(), 0, StyleW); HeapFree(GetProcessHeap(), 0, StyleW);
pFT_Done_Face(ft_face); pFT_Done_Face(ft_face);
return 0; return 1;
} else { } else {
TRACE("Replacing original with this one\n"); TRACE("Replacing original with this one\n");
list_remove(&face->entry); list_remove(&face->entry);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment