mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Don't load icon theme twice

Browse source
This commit is contained in:
Alexander Koblov 2024-02-02 20:52:52 +03:00
commit 7adcd8647e
1 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/platform/uicontheme.pas
View file

@ -4,7 +4,7 @@
Simple implementation of Icon Theme based on FreeDesktop.org specification
(http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html)
Copyright (C) 2009-2017 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2009-2024 Alexander Koblov (alexx2000@mail.ru)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -172,7 +172,6 @@ var
sElement: String;
begin
FTheme:= sThemeName;
FInherits:= nil;
FDefaultTheme:= ADefaultTheme;
FOwnsInheritsObject:= False;
FDirectories:= nil;
@ -194,21 +193,11 @@ begin
end;
destructor TIconTheme.Destroy;
var
I: Integer;
begin
if FOwnsInheritsObject and Assigned(FInherits) then
begin
for I:= FInherits.Count - 1 downto 0 do
begin
if Assigned(FInherits.Objects[I]) then
begin
TIconTheme(FInherits.Objects[I]).Free;
FInherits.Objects[I]:= nil;
end;
end;
FreeAndNil(FInherits);
end;
if FOwnsInheritsObject then
begin
FInherits.Free;
end;
FreeAndNil(FDirectories);
inherited Destroy;
end;
@ -261,6 +250,7 @@ begin
else // new theme
begin
FInherits:= TStringList.Create;
FInherits.OwnsObjects:= True;
FOwnsInheritsObject:= True;
end;
@ -295,17 +285,16 @@ end;
procedure TIconTheme.LoadParentTheme(AThemeName: String);
var
I: Integer;
Index: Integer;
ATheme: TIconTheme;
begin
if FInherits.IndexOf(AThemeName) < 0 then
if (FTheme <> AThemeName) and (FInherits.IndexOf(AThemeName) < 0) then
begin
ATheme:= CreateParentTheme(AThemeName);
I:= FInherits.AddObject(AThemeName, ATheme);
Index:= FInherits.AddObject(AThemeName, ATheme);
if not ATheme.LoadThemeWithInherited(FInherits) then
begin
ATheme.Free;
FInherits.Delete(I);
FInherits.Delete(Index);
end;
end;
end;