From 08ed2844b3440c5cef4fb0e1628da7829fa401f1 Mon Sep 17 00:00:00 2001
From: Juha <juha@lazarus-ide.org>
Date: Thu, 9 Dec 2021 10:37:52 +0200
Subject: [PATCH] Project Templates: Improve configuration of ProjectFile and
 other variables. Issue #38244, patch by Rolf Wetjen.

---
 .../projecttemplates/frmtemplatevariables.pas   | 17 ++++++++++++-----
 components/projecttemplates/projecttemplates.pp |  8 ++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/components/projecttemplates/frmtemplatevariables.pas b/components/projecttemplates/frmtemplatevariables.pas
index ef6929b35b..7a7fd46ff2 100644
--- a/components/projecttemplates/frmtemplatevariables.pas
+++ b/components/projecttemplates/frmtemplatevariables.pas
@@ -94,7 +94,7 @@ procedure TProjectVariablesForm.SetVariables(const AValue: TStrings);
 
 Var
   N,V : String;
-  I : Integer;
+  I,J : Integer;
   
 begin
   FVariables:=AValue;
@@ -108,12 +108,19 @@ begin
     SGVariables.RowCount:=FVariables.Count+1;
     For I:=1 to FVariables.Count do
       begin
-      V:='';
-      N:='';
       FVariables.GetNameValue(I-1,N,V);
       SGVariables.Cells[0,I]:=N;
-      SGVariables.Cells[1,I]:='';
-      SGVariables.Cells[2,I]:=V;
+      J:=Pos('|',V);
+      if J>0 then
+        begin
+        SGVariables.Cells[1,I]:=copy(V,J+1,Length(V));
+        SGVariables.Cells[2,I]:=copy(V,1,J-1);
+        end
+      else
+        begin
+        SGVariables.Cells[1,I]:='';
+        SGVariables.Cells[2,I]:=V;
+        end;
       end;
     end;
 end;
diff --git a/components/projecttemplates/projecttemplates.pp b/components/projecttemplates/projecttemplates.pp
index 13334a8b72..1f32c9c535 100644
--- a/components/projecttemplates/projecttemplates.pp
+++ b/components/projecttemplates/projecttemplates.pp
@@ -287,6 +287,7 @@ procedure TProjectTemplate.InitFromDir(const DirName: String);
 Var
   L : TStringList;
   FN : String;
+  sr: TSearchRec;
   
 begin
   FDirectory:=IncludeTrailingPathDelimiter(DirName);
@@ -298,6 +299,13 @@ begin
       With TMemInifile.Create(FN) do
         try
           FProjectFile:=ReadString(SProject,KeyProjectFile,FProjectFile);
+          If Not FileExists(FDirectory+FProjectFile+'.lpi') then
+            begin
+              If (FindFirstUTF8(FDirectory+'*.lpi',0,sr)=0)
+              and FileExistsUTF8(FDirectory+sr.Name) then
+                FProjectFile:=ExtractFileNameOnly(sr.Name);
+              FindClose(sr);
+            end;
           FName:=ReadString(SProject,KeyName,DirName);
           FAuthor:=ReadString(SProject,KeyAuthor,'');
           FDescription:=ReadString(SProject,KeyDescription,'');