paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 21:07:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid CopyFile over itself fp.cfg after copying fp.ini, thus avoiding misleading ErrorBox

Browse Source 
git-svn-id: trunk@29476 -
This commit is contained in:
pierre 2015-01-15 16:53:58 +00:00
parent b1e51054cb
commit c9f73354af
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ide/fpini.pas
View File

@ -32,6 +32,7 @@ procedure SetPrinterDevice(const Device: string);
implementation
uses
sysutils, { used for SameFileName function }
Dos,Objects,Drivers,
FVConsts,
Version,
@ -233,10 +234,17 @@ begin
ErrorBox(FormatStrStr(msg_errorwritingfile,CurDir+IniName),nil)
else
IniFileName:=CurDir+IniName;
if CopyFile(SwitchesPath,CurDir+SwitchesName)=false then
ErrorBox(FormatStrStr(msg_errorwritingfile,CurDir+SwitchesName),nil)
else
SwitchesPath:=CurDir+SwitchesName;
{ copy also SwitchesPath to current dir, but only if
1) SwitchesPath exists
2) SwitchesPath is different from CurDir+SwitchesName }
if ExistsFile(SwitchesPath) and
not SameFileName(SwitchesPath,CurDir+SwitchesName) then
begin
if CopyFile(SwitchesPath,CurDir+SwitchesName)=false then
ErrorBox(FormatStrStr(msg_errorwritingfile,CurDir+SwitchesName),nil)
else
SwitchesPath:=CurDir+SwitchesName;
end;
end;
end
else