mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-11 20:49:14 +02:00
* global appconfig dir needs to be common_appdata directory
git-svn-id: trunk@10068 -
This commit is contained in:
parent
601bc7345e
commit
50a9dcd5f9
@ -1040,32 +1040,20 @@ Function GetAppConfigDir(Global : Boolean) : String;
|
|||||||
|
|
||||||
begin
|
begin
|
||||||
If Global then
|
If Global then
|
||||||
Result:=DGetAppConfigDir(Global) // or use windows dir ??
|
Result:=GetSpecialDir(CSIDL_COMMON_APPDATA)+ApplicationName
|
||||||
else
|
else
|
||||||
begin
|
|
||||||
Result:=GetSpecialDir(CSIDL_LOCAL_APPDATA)+ApplicationName;
|
Result:=GetSpecialDir(CSIDL_LOCAL_APPDATA)+ApplicationName;
|
||||||
If (Result='') then
|
If (Result='') then
|
||||||
Result:=DGetAppConfigDir(Global);
|
Result:=DGetAppConfigDir(Global);
|
||||||
end;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
Function GetAppConfigFile(Global : Boolean; SubDir : Boolean) : String;
|
Function GetAppConfigFile(Global : Boolean; SubDir : Boolean) : String;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
if Global then
|
Result:=IncludeTrailingPathDelimiter(GetAppConfigDir(Global));
|
||||||
begin
|
if SubDir then
|
||||||
Result:=IncludeTrailingPathDelimiter(DGetAppConfigDir(Global));
|
Result:=IncludeTrailingPathDelimiter(Result+'Config');
|
||||||
if SubDir then
|
Result:=Result+ApplicationName+ConfigExtension;
|
||||||
Result:=IncludeTrailingPathDelimiter(Result+'Config');
|
|
||||||
Result:=Result+ApplicationName+ConfigExtension;
|
|
||||||
end
|
|
||||||
else
|
|
||||||
begin
|
|
||||||
Result:=IncludeTrailingPathDelimiter(GetAppConfigDir(False));
|
|
||||||
if SubDir then
|
|
||||||
Result:=Result+'Config\';
|
|
||||||
Result:=Result+ApplicationName+ConfigExtension;
|
|
||||||
end;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
Procedure InitSysConfigDir;
|
Procedure InitSysConfigDir;
|
||||||
|
Loading…
Reference in New Issue
Block a user