paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 06:29:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug ID #34854

Browse Source 
git-svn-id: trunk@41332 -
This commit is contained in:
michael 2019-02-16 08:50:13 +00:00
parent 4143ecf6c0
commit 3d2de82656
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/fcl-xml/src/xmlconf.pp
View File

@ -166,6 +166,7 @@ Var
begin begin
F:=TFileStream.Create(AFileName,fmOpenread or fmShareDenyWrite); F:=TFileStream.Create(AFileName,fmOpenread or fmShareDenyWrite);
try try
FFileName := '';
ReadXMLFile(Doc, AFilename); ReadXMLFile(Doc, AFilename);
FFileName:=AFileName; FFileName:=AFileName;
finally finally
@ -398,11 +399,14 @@ procedure TXMLConfig.DoSetFilename(const AFilename: String; ForceReload: Boolean
begin begin
if (not ForceReload) and (FFilename = AFilename) then if (not ForceReload) and (FFilename = AFilename) then
exit; exit;
Flush; Flush;
FreeAndNil(Doc); FreeAndNil(Doc);
if csLoading in ComponentState then if csLoading in ComponentState then
begin
FFilename := AFilename;
exit; exit;
end;
if FileExists(AFilename) and not FStartEmpty then if FileExists(AFilename) and not FStartEmpty then
LoadFromFile(AFilename) LoadFromFile(AFilename)
else if not Assigned(Doc) then else if not Assigned(Doc) then
@ -425,6 +429,8 @@ begin
if AValue <> FRootName then if AValue <> FRootName then
begin begin
FRootName := AValue; FRootName := AValue;
if not (ComponentState * [csLoading,csDesigning] = []) then
Exit;
Root := Doc.DocumentElement; Root := Doc.DocumentElement;
Cfg := Doc.CreateElement(AValue); Cfg := Doc.CreateElement(AValue);
while Assigned(Root.FirstChild) do while Assigned(Root.FirstChild) do
@ -475,7 +481,7 @@ var
begin begin
for I := Length(FPathStack)-1 downto 0 do for I := Length(FPathStack)-1 downto 0 do
FPathStack[I] := ''; FPathStack[I] := '';
FElement := nil; FElement := nil;
FPathDirty := False; FPathDirty := False;
FPathCount := 0; FPathCount := 0;
end; end;