paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 12:49:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Bart Broersma to fix deleting non-empty key (bug ID 0035132)

Browse Source 
git-svn-id: trunk@41816 -
This commit is contained in:
michael 2019-04-01 17:06:56 +00:00
parent d13f0c3f80
commit 6c7da3cca4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/fcl-registry/src/xmlreg.pp
View File

@ -234,13 +234,23 @@ end;
Function TXmlRegistry.DeleteKey(KeyPath : UnicodeString) : Boolean; Function TXmlRegistry.DeleteKey(KeyPath : UnicodeString) : Boolean;
Var Var
N : TDomElement; N, Curr : TDomElement;
Node: TDOMNode;
begin begin
N:=FindKey(KeyPath); N:=FindKey(KeyPath);
Result:=(N<>Nil); Result:=(N<>Nil);
If Result then If Result then
begin begin
//if a key has subkeys, result shall be false and nothing shall be deleted
Curr:=N;
Node:=Curr.FirstChild;
While Assigned(Node) do
begin
If (Node.NodeType=ELEMENT_NODE) and (Node.NodeName=SKey) then
Exit(False);
Node:=Node.NextSibling;
end;
(N.ParentNode as TDomElement).RemoveChild(N); (N.ParentNode as TDomElement).RemoveChild(N);
FDirty:=True; FDirty:=True;
MaybeFlush; MaybeFlush;