Oops. Made a mistake when adding config file names to monitor list
This commit is contained in:
parent
4645eedfcc
commit
4aded3e0dd
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* $XFree86: xc/lib/fontconfig/src/fcxml.c,v 1.12 2002/06/19 20:08:22 keithp Exp $
|
* $XFree86: xc/lib/fontconfig/src/fcxml.c,v 1.13 2002/06/21 06:14:45 keithp Exp $
|
||||||
*
|
*
|
||||||
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
|
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
|
||||||
*
|
*
|
||||||
|
@ -1655,6 +1655,10 @@ FcConfigParseAndLoad (FcConfig *config,
|
||||||
filename = FcConfigFilename (name);
|
filename = FcConfigFilename (name);
|
||||||
if (!filename)
|
if (!filename)
|
||||||
goto bail0;
|
goto bail0;
|
||||||
|
|
||||||
|
if (!FcStrSetAdd (config->configFiles, filename))
|
||||||
|
goto bail0;
|
||||||
|
|
||||||
f = fopen ((char *) filename, "r");
|
f = fopen ((char *) filename, "r");
|
||||||
free (filename);
|
free (filename);
|
||||||
if (!f)
|
if (!f)
|
||||||
|
@ -1667,9 +1671,6 @@ FcConfigParseAndLoad (FcConfig *config,
|
||||||
if (!FcConfigInit (&parse, name, config, p))
|
if (!FcConfigInit (&parse, name, config, p))
|
||||||
goto bail2;
|
goto bail2;
|
||||||
|
|
||||||
if (!FcConfigAddConfigFile (config, filename))
|
|
||||||
goto bail3;
|
|
||||||
|
|
||||||
XML_SetUserData (p, &parse);
|
XML_SetUserData (p, &parse);
|
||||||
|
|
||||||
XML_SetDoctypeDeclHandler (p, FcStartDoctypeDecl, FcEndDoctypeDecl);
|
XML_SetDoctypeDeclHandler (p, FcStartDoctypeDecl, FcEndDoctypeDecl);
|
||||||
|
|
Loading…
Reference in New Issue