Commit 0b10f0b8 authored by Alexandre Julliard's avatar Alexandre Julliard

gdi32: Initialize fontconfig even when fonts are cached.

parent 8681774a
...@@ -3703,10 +3703,6 @@ static void init_font_list(void) ...@@ -3703,10 +3703,6 @@ static void init_font_list(void)
char *unixname; char *unixname;
const char *data_dir; const char *data_dir;
#ifdef SONAME_LIBFONTCONFIG
init_fontconfig();
#endif
delete_external_font_keys(); delete_external_font_keys();
/* load the system bitmap fonts */ /* load the system bitmap fonts */
...@@ -3885,6 +3881,10 @@ BOOL WineEngInit(void) ...@@ -3885,6 +3881,10 @@ BOOL WineEngInit(void)
if(!init_freetype()) return FALSE; if(!init_freetype()) return FALSE;
#ifdef SONAME_LIBFONTCONFIG
init_fontconfig();
#endif
if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL)
{ {
ERR("Failed to create font mutex\n"); ERR("Failed to create font mutex\n");
......
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