fix(icon): Removed useless calls to method ResetCacheIcon at asuite s…

…tartup
salvadorbs · Oct 1, 2024 · 1ea24e2 · 1ea24e2
1 parent a4b7ee7
commit 1ea24e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Library/Icons.Base.pas b/Library/Icons.Base.pas
@@ -59,6 +59,7 @@   TBaseIcon = class
 
     procedure ResetIcon; virtual;
     procedure ResetCacheIcon;
+    function CheckImageIndex: Boolean;
 
     property Name: string read GetName;
     property ImageIndex: Integer read GetImageIndex;
@@ -127,8 +128,10 @@ function TBaseIcon.InternalLoadIcon: Integer;
     sPathCacheIcon := PathCacheIcon;
     if (FileExists(sPathCacheIcon)) and (CacheIconCRC = intHash) then
       sTempPath := sPathCacheIcon
-    else
+    else begin
+      TASuiteLogger.Debug('sPathCacheIcon = %s - CacheIconCRC = %d - intHash = %d', [sPathCacheIcon, CacheIconCRC, intHash]);
       ResetCacheIcon;
+    end;
   end;
 
   //Icon or exe
@@ -236,6 +239,11 @@ function TBaseIcon.LoadFromFileIcon(const APathFile: string;
   end;
 end;
 
+function TBaseIcon.CheckImageIndex: Boolean;
+begin
+  Result := FImageIndex <> -1;
+end;
+
 function TBaseIcon.InternalGetImageIndex(const APathFile: string): Integer;
 var
   bmpSmallIcon, bmpLargeIcon: TBGRABitmap;

diff --git a/Library/NodeDataTypes.Files.pas b/Library/NodeDataTypes.Files.pas
@@ -251,7 +251,7 @@ procedure TvFileNodeData.CheckPathFile;
   if FIsPathFileExists <> bPathExists then
   begin
     FIsPathFileExists := bPathExists;
-    if Config.ASuiteState = lsNormal then
+    if (Config.ASuiteState = lsNormal) and (Icon.CheckImageIndex) then
       Icon.ResetIcon;
   end;
 end;