paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-24 12:39:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: replace OnGetApplicationName with hardcoded 'lazarus', so that Application.Title isn't used in GetAppConfigDir (issue #18396)

Browse Source 
git-svn-id: trunk@28874 -
This commit is contained in:
vincents 2011-01-06 15:41:43 +00:00
parent c3cc4ea704
commit 70d3297249
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ide/lazarus.pp
View File

@ -48,8 +48,10 @@ uses
{$IF defined(Unix) and not defined(VER2_2_0) and not defined(VER2_2_2)} {$IF defined(Unix) and not defined(VER2_2_0) and not defined(VER2_2_2)}
clocale, clocale,
{$ENDIF} {$ENDIF}
SysUtils,
Interfaces, Interfaces,
Forms, LCLProc, Forms, LCLProc,
LazConf,
Splash, Splash,
Main, Main,
AboutFrm, AboutFrm,
@ -88,6 +90,7 @@ begin
LazarusRevisionStr:=RevisionStr; LazarusRevisionStr:=RevisionStr;
Application.Title:='Lazarus'; Application.Title:='Lazarus';
OnGetApplicationName:=@GetLazarusApplicationName;
Application.Initialize; Application.Initialize;
TMainIDE.ParseCmdLineOptions; TMainIDE.ParseCmdLineOptions;
if Application.Terminated then exit; if Application.Terminated then exit;

9
ide/lazconf.pp
View File

@ -124,6 +124,10 @@ function GetDefaultLCLLibPaths(const Prefix, Postfix, Separator: string): string
// returrns the default browser // returrns the default browser
procedure GetDefaultBrowser(var Browser, Params: string); procedure GetDefaultBrowser(var Browser, Params: string);
// Replace OnGetApplicationName, so that Application.Title
// doesn't interfere with GetAppConfigDir and related.
function GetLazarusApplicationName: string;
type type
TLazConfMacroFunc = procedure(var s: string); TLazConfMacroFunc = procedure(var s: string);
var var
@ -167,6 +171,11 @@ begin
List.Add(Filename); List.Add(Filename);
end; end;
function GetLazarusApplicationName: string;
begin
Result := 'lazarus';
end;
procedure LazConfSubstituteMacros(var s: string); procedure LazConfSubstituteMacros(var s: string);
begin begin
if Assigned(LazConfMacroFunc) then if Assigned(LazConfMacroFunc) then