Pārlūkot izejas kodu

Bug fix: Custom commands submenu with the other custom command type was not disabled when there was no such custom command

Source commit: 13be4c52db6a902e0a6b1b49d56d38b1a71cdee6
Martin Prikryl 9 gadi atpakaļ
vecāks
revīzija
388cf1e7a1
1 mainītis faili ar 2 papildinājumiem un 1 dzēšanām
  1. 2 1
      source/forms/NonVisual.cpp

+ 2 - 1
source/forms/NonVisual.cpp

@@ -1117,10 +1117,11 @@ void __fastcall TNonVisualDataModule::CreateCustomCommandsMenu(
     Item->Action = (ListType == ccltFile) ? CustomCommandsNonFileAction : CustomCommandsFileAction;
     Item->Action = NULL;
     TCustomCommandListType SubListType = (ListType == ccltFile) ? ccltNonFile : ccltFile;
-    CreateCustomCommandsListMenu(WinConfiguration->CustomCommandList, Item, OnFocused, Toolbar, SubListType, 0);
+    int CustomCommandItems = CreateCustomCommandsListMenu(WinConfiguration->CustomCommandList, Item, OnFocused, Toolbar, SubListType, 0);
     TTBXSeparatorItem * Separator = AddMenuSeparator(Item);
     int ExtensionItems = CreateCustomCommandsListMenu(WinConfiguration->ExtensionList, Item, OnFocused, Toolbar, SubListType, CustomCommandExtension);
     Separator->Visible = (ExtensionItems > 0);
+    Item->Enabled = (CustomCommandItems + ExtensionItems > 0);
 
     Menu->Add(Item);
   }