paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-19 00:49:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: simplified

Browse Source 
git-svn-id: branches/fixes_1_4@47755 -
This commit is contained in:
mattias 2015-02-13 21:32:01 +00:00
parent 719ba52cad
commit fa18b486d9
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ide/buildmanager.pas
View File

@ -1664,17 +1664,9 @@ begin
FileNameOnly:=ExtractFilenameOnly(Filename);
if BackupInfo.SubDirectory<>'' then begin
SubDir:=FilePath+BackupInfo.SubDirectory;
repeat
if not DirPathExists(SubDir) then begin
if not CreateDirUTF8(SubDir) then begin
Result:=IDEMessageDialog(lisCCOWarningCaption,
Format(lisUnableToCreateBackupDirectory, [SubDir])
,mtWarning,[mbAbort,mbRetry,mbIgnore]);
if Result=mrAbort then exit;
if Result=mrIgnore then Result:=mrOk;
end;
end;
until Result<>mrRetry;
Result:=ForceDirectoryInteractive(SubDir,[mbRetry,mbIgnore]);
if Result=mrCancel then exit;
if Result=mrIgnore then Result:=mrOk;
end;
if BackupInfo.BackupType in
[bakSymbolInFront,bakSymbolBehind,bakUserDefinedAddExt,bakSameName] then
@ -1690,7 +1682,7 @@ begin
BackupFilename:=FileNameOnly+FileExt;
end;
if BackupInfo.SubDirectory<>'' then
BackupFilename:=SubDir+PathDelim+BackupFilename
BackupFilename:=AppendPathDelim(SubDir)+BackupFilename
else
BackupFilename:=FilePath+BackupFilename;
// remove old backup file
@ -1708,7 +1700,7 @@ begin
end else begin
// backup with counter
if BackupInfo.SubDirectory<>'' then
BackupFilename:=SubDir+PathDelim+FileNameOnly+FileExt+';'
BackupFilename:=AppendPathDelim(SubDir)+FileNameOnly+FileExt+';'
else
BackupFilename:=Filename+';';
if BackupInfo.MaxCounter<=0 then begin