Ver código fonte

FIX: Disappear main menu icons

Alexander Koblov 9 anos atrás
pai
commit
7f4542849e
1 arquivos alterados com 4 adições e 1 exclusões
  1. 4 1
      src/fmain.pas

+ 4 - 1
src/fmain.pas

@@ -968,6 +968,8 @@ begin
     lastWindowState:=WindowState;
     lastWindowState:=WindowState;
   // frost_asm end
   // frost_asm end
 
 
+  UpdateActionIcons;
+
   UpdateWindowView;
   UpdateWindowView;
 
 
 {$IFDEF LCLQT}
 {$IFDEF LCLQT}
@@ -2450,6 +2452,8 @@ var
   iconImg: TPicture;
   iconImg: TPicture;
   actionName: TComponentName;
   actionName: TComponentName;
 begin
 begin
+  if not gIconsInMenus then Exit;
+
   actionLst.Images := nil;
   actionLst.Images := nil;
   pmTabMenu.Images := nil;
   pmTabMenu.Images := nil;
   mnuMain.Images := nil;
   mnuMain.Images := nil;
@@ -4603,7 +4607,6 @@ begin
       UpdateFreeSpace(fpRight);
       UpdateFreeSpace(fpRight);
     end;
     end;
 
 
-    if gIconsInMenus then UpdateActionIcons;
     UpdateHotDirIcons; // Preferable to be loaded even if not required in popupmenu *because* in the tree it's a must, especially when checking for missing directories
     UpdateHotDirIcons; // Preferable to be loaded even if not required in popupmenu *because* in the tree it's a must, especially when checking for missing directories
     ShowTrayIcon(gAlwaysShowTrayIcon);
     ShowTrayIcon(gAlwaysShowTrayIcon);