From 2451cd3995e39042aa9fbac803de67023370f792 Mon Sep 17 00:00:00 2001
From: Juha <juha@lazarus-ide.org>
Date: Sat, 22 Jan 2022 20:10:48 +0200
Subject: [PATCH] IDE: Disable 'Abort Build' menu item when not building. Issue
 #39585.

(cherry picked from commit 58f8d079254302a51b28b5fd56a5d5cfecddb931)
---
 ide/mainbar.pas  | 4 ++++
 ide/mainbase.pas | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ide/mainbar.pas b/ide/mainbar.pas
index 14800be778..e95781e664 100644
--- a/ide/mainbar.pas
+++ b/ide/mainbar.pas
@@ -851,13 +851,17 @@ procedure TMainIDEBar.AllowCompilation(aAllow: Boolean);
 // Enables or disables IDE GUI controls associated with compiling and building.
 // Does it interfere with DebugBoss.UpdateButtonsAndMenuItems? Maybe should be refactored and combined.
 begin
+  // Run menu
   itmRunMenuRunWithoutDebugging.Enabled:=aAllow;
   itmRunMenuRun.Enabled:=aAllow;
   itmRunMenuCompile.Enabled:=aAllow;
   itmRunMenuBuild.Enabled:=aAllow;
   itmRunMenuQuickCompile.Enabled:=aAllow;
   itmRunMenuCleanUpAndBuild.Enabled:=aAllow;
+  itmRunMenuAbortBuild.Enabled:=not aAllow;
+  // Package menu
   itmPkgEditInstallPkgs.Enabled:=aAllow;
+  // Tools menu
   itmToolRescanFPCSrcDir.Enabled:=aAllow;
   itmToolBuildLazarus.Enabled:=aAllow;
   //itmToolConfigureBuildLazarus.Enabled:=aAllow;
diff --git a/ide/mainbase.pas b/ide/mainbase.pas
index 8591a36a0a..15e9ebbf87 100644
--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@@ -1243,8 +1243,7 @@ begin
     ParentMI:=itmProjectSaveSection;
     CreateMenuItem(ParentMI,itmProjectSave,'itmProjectSave',lisMenuSaveProject, 'menu_project_save');
     CreateMenuItem(ParentMI,itmProjectSaveAs,'itmProjectSaveAs',lisMenuSaveProjectAs, 'menu_project_save_as');
-    CreateMenuItem(ParentMI, itmProjectResaveFormsWithI18n, 'itmProjectResaveFo'
-      +'rmsWithI18n', lisMenuResaveFormsWithI18n);
+    CreateMenuItem(ParentMI, itmProjectResaveFormsWithI18n, 'itmProjectResaveFormsWithI18n', lisMenuResaveFormsWithI18n);
     CreateMenuItem(ParentMI,itmProjectPublish,'itmProjectPublish',lisMenuPublishProject);
 
     CreateMenuSeparatorSection(mnuProject,itmProjectWindowSection,'itmProjectWindowSection');
@@ -1274,7 +1273,7 @@ begin
     CreateMenuItem(ParentMI,itmRunMenuQuickCompile,'itmRunMenuQuickCompile',lisMenuQuickCompile,'menu_quick_compile');
     CreateMenuItem(ParentMI,itmRunMenuCleanUpAndBuild,'itmRunMenuCleanUpAndBuild',lisMenuCleanUpAndBuild,'menu_build');
     CreateMenuItem(ParentMI,itmRunMenuBuildManyModes,'itmRunMenuBuildManyModes',lisMenuCompileManyModes,'menu_build_all');
-    CreateMenuItem(ParentMI,itmRunMenuAbortBuild,'itmRunMenuAbortBuild',lisMenuAbortBuild,'menu_abort_build');
+    CreateMenuItem(ParentMI,itmRunMenuAbortBuild,'itmRunMenuAbortBuild',lisMenuAbortBuild,'menu_abort_build',False);
 
     CreateMenuSeparatorSection(mnuRun,itmRunnning,'itmRunnning');
     ParentMI:=itmRunnning;