|
@@ -645,13 +645,11 @@ var
|
|
FN : PFcChar8;
|
|
FN : PFcChar8;
|
|
lDir: string;
|
|
lDir: string;
|
|
config: PfcConfig;
|
|
config: PfcConfig;
|
|
-const
|
|
|
|
- is_fc_loaded:integer=0;
|
|
|
|
{$endif}
|
|
{$endif}
|
|
begin
|
|
begin
|
|
{$ifdef HasFontsConf} // Linux & BSD
|
|
{$ifdef HasFontsConf} // Linux & BSD
|
|
- if (is_fc_loaded=0) then
|
|
|
|
- is_fc_loaded:=loadfontconfiglib('');
|
|
|
|
|
|
+ if not FontConfigLibLoaded then
|
|
|
|
+ loadfontconfiglib('');
|
|
|
|
|
|
config := FcInitLoadConfigAndFonts();
|
|
config := FcInitLoadConfigAndFonts();
|
|
|
|
|
|
@@ -894,8 +892,8 @@ begin
|
|
Result:=false;
|
|
Result:=false;
|
|
res:='';
|
|
res:='';
|
|
|
|
|
|
- if (is_fc_loaded=0) then
|
|
|
|
- is_fc_loaded:=loadfontconfiglib('');
|
|
|
|
|
|
+ if not FontConfigLibLoaded then
|
|
|
|
+ loadfontconfiglib('');
|
|
|
|
|
|
config := FcInitLoadConfigAndFonts();
|
|
config := FcInitLoadConfigAndFonts();
|
|
|
|
|