paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 12:36:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: reduce memleaks when loading custom keyscheme, based on part of patch by Dean Mustakinov, issue #40559

Browse Source 
(cherry picked from commit a187c73c68)
This commit is contained in:
Maxim Ganetsky 2023-11-08 18:21:58 +03:00
parent 91c3bf3781
commit dd0b913271
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ide/keymapping.pp
View File

@ -4375,12 +4375,18 @@ begin
try try
xml := TXMLConfig.Create(fn[i]); xml := TXMLConfig.Create(fn[i]);
exp := TKeyCommandRelationList.Create; exp := TKeyCommandRelationList.Create;
nm := xml.GetValue('Name/Value',''); try
if nm = '' then nm := ExtractFileName(fn[i]); nm := xml.GetValue('Name/Value','');
if (dst.IndexOf(nm)<0) then begin if nm = '' then nm := ExtractFileName(fn[i]);
exp.DefineCommandCategories; // default Relations if (dst.IndexOf(nm)<0) then begin
exp.LoadFromXMLConfig(xml, 'KeyMapping/', false); exp.DefineCommandCategories; // default Relations
dst.AddObject(nm, exp); exp.LoadFromXMLConfig(xml, 'KeyMapping/', false);
dst.AddObject(nm, exp);
exp := nil;
end;
finally
xml.Free;
exp.Free;
end; end;
except except
end; end;