From 14ed68a2606c9014ffc4d19df273248847a76459 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Mon, 1 Mar 2021 15:39:00 +0000
Subject: [PATCH] IDE: Update project's DefineTemplates after closing project
 compiler option.

git-svn-id: trunk@64712 -
---
 ide/main.pp              | 5 ++---
 ide/projectinspector.pas | 8 +++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ide/main.pp b/ide/main.pp
index 2f9e80f279..128b159aef 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -4425,6 +4425,8 @@ begin
     if not Project1.OtherDefines.Equals(Project1.CompilerOptions.OtherDefines) then
       Project1.OtherDefines.Assign(Project1.CompilerOptions.OtherDefines);
     Project1.Modified:=True;
+    Project1.DefineTemplates.AllChanged(false);
+    IncreaseCompilerParseStamp;
     MainBuildBoss.SetBuildTargetProject1(false);
     MainIDE.UpdateCaption;
   end;
@@ -5206,9 +5208,6 @@ begin
     UpdateCaption;
     if Assigned(ProjInspector) then
       ProjInspector.UpdateTitle;
-    Project1.DefineTemplates.AllChanged(false);
-    IncreaseCompilerParseStamp;
-
     if Project1.UseAsDefault then
     begin
       // save as default
diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas
index b1adb35e5b..dcde122220 100644
--- a/ide/projectinspector.pas
+++ b/ide/projectinspector.pas
@@ -68,9 +68,10 @@ uses
   // IDEIntf
   IDEHelpIntf, IDECommands, IDEDialogs, IDEImagesIntf, LazIDEIntf, ToolBarIntf,
   // IDE
-  LazarusIDEStrConsts, MainBase, IDEProcs, DialogProcs, IDEOptionDefs, Project, InputHistory,
-  EnvironmentOpts, AddToProjectDlg, AddPkgDependencyDlg, AddFPMakeDependencyDlg,
-  ProjPackChecks, ProjPackEditing, ProjPackFilePropGui, PackageDefs, PackageSystem, BuildManager;
+  LazarusIDEStrConsts, MainBase, IDEProcs, DialogProcs, IDEOptionDefs, Project,
+  InputHistory, TransferMacros, EnvironmentOpts, BuildManager,
+  ProjPackChecks, ProjPackEditing, ProjPackFilePropGui, PackageDefs, PackageSystem,
+  AddToProjectDlg, AddPkgDependencyDlg, AddFPMakeDependencyDlg;
 
 type
   TOnAddUnitToProject =
@@ -1748,6 +1749,7 @@ begin
 
   Project1.ActiveBuildMode := NewMode;
   Project1.DefineTemplates.AllChanged(false);
+  IncreaseCompilerParseStamp;
   MainBuildBoss.SetBuildTargetProject1(false);
   MainIDE.UpdateCaption;
   if Assigned(ProjInspector) then