From 7539c41b276417ccbcdf4003603834072ee58666 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Mon, 7 Nov 2022 09:01:37 +1100 Subject: [PATCH] fix(developer): disable Keyboard|Compile if no project loaded Fixes #7641. If you close the active project and have the Welcome window visible, it was possible for the Compile action to still be enabled, even though there was nothing to compile. --- developer/src/tike/actions/dmActionsKeyboardEditor.pas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/developer/src/tike/actions/dmActionsKeyboardEditor.pas b/developer/src/tike/actions/dmActionsKeyboardEditor.pas index 5dd7df442d..4f6434d693 100644 --- a/developer/src/tike/actions/dmActionsKeyboardEditor.pas +++ b/developer/src/tike/actions/dmActionsKeyboardEditor.pas @@ -149,6 +149,7 @@ uses Keyman.Developer.System.Project.kmnProjectFile, Keyman.Developer.UI.Project.kmnProjectFileUI, Keyman.Developer.System.Project.kpsProjectFile, + Keyman.Developer.System.Project.Project, Keyman.Developer.System.Project.ProjectFile, Keyman.Developer.UI.Project.ProjectFileUI, Keyman.Developer.UI.Project.UfrmProject, @@ -470,13 +471,13 @@ begin actKeyboardCompile.Enabled := (ActiveEditor <> nil) or (ActivePackageEditor <> nil) or - (frmKeymanDeveloper.ActiveChild is TfrmProject); + ((frmKeymanDeveloper.ActiveChild is TfrmProject) and (FGlobalProject <> nil)); if actKeyboardCompile.Enabled then actKeyboardCompile.ShortCut := Vcl.Menus.Shortcut(VK_F7, []) else actKeyboardCompile.ShortCut := scNone; - frmKeymanDeveloper.mnuKeyboard.Visible := actKeyboardCompile.Enabled; + frmKeymanDeveloper.mnuKeyboard.Visible := True; frmKeymanDeveloper.mnuDebug.Visible := ActiveEditor <> nil; end;