IDE: fixed clearing project target file name when using project template

git-svn-id: trunk@45214 -
This commit is contained in:
mattias 2014-05-28 17:05:12 +00:00
parent 1c1b39f232
commit 2a05226c0a

View File

@ -467,6 +467,7 @@ end;
procedure TMainIDEBase.DoMergeDefaultProjectOptions(AProject: TProject);
var
AFilename: String;
ShortFilename: String;
begin
// load default project options if exists
AFilename:=AppendPathDelim(GetPrimaryConfigPath)+DefaultProjectOptionsFilename;
@ -491,9 +492,13 @@ begin
exit; // using default -> ok
if CompareFilenames(AFilename,ExtractFilename(AProject.ProjectInfoFile))=0
then exit; // target file name and project name fit -> ok
// change target file to project name
AProject.CompilerOptions.TargetFilename:=ExtractFilePath(AProject.CompilerOptions.TargetFilename)
+ExtractFileNameOnly(AProject.ProjectInfoFile)+ExtractFileExt(AFilename);
ShortFilename:=ExtractFileNameOnly(AProject.ProjectInfoFile);
if ShortFilename<>'' then
AProject.CompilerOptions.TargetFilename:=
ExtractFilePath(AProject.CompilerOptions.TargetFilename)
+ShortFilename+ExtractFileExt(AFilename);
AProject.CompilerOptions.Modified:=false;
end;