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

IDE: Load Desktop options correctly from environment. Issue #38376, patch from Uwe Schächterle.

Browse Source 
git-svn-id: trunk@64414 -
This commit is contained in:
juha 2021-01-21 15:49:12 +00:00
parent 9e251a5c0a
commit 5ee798bb60
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/environmentopts.pp
View File

@ -3678,10 +3678,8 @@ function TEnvironmentOptions.GetActiveDesktop: TDesktopOpt;
end;
var
OldActiveDesktop: TDesktopOpt;
OldActiveDesktopName: string;
lDskTpOpt: TCustomDesktopOpt;
OldActiveDesktop, lDskTpOpt: TCustomDesktopOpt;
begin
Result := nil;
if FActiveDesktopName <> '' then
@ -3711,8 +3709,8 @@ begin
Result.Assign(FDesktop);
if Assigned(IDEDockMaster) then
Result.FDockedOpt.LoadDefaults;
OldActiveDesktop := TDesktopOpt(FDesktops.Find(OldActiveDesktopName));
if not Assigned(OldActiveDesktop) then
OldActiveDesktop := FDesktops.Find(OldActiveDesktopName);
if not (OldActiveDesktop is TDesktopOpt) then
begin
lDskTpOpt := FDesktops.Find('default');
if Assigned(lDskTpOpt) and lDskTpOpt.InheritsFrom(TDesktopOpt) and lDskTpOpt.Compatible then
@ -3721,7 +3719,7 @@ begin
OldActiveDesktop := nil;
end;
if Assigned(OldActiveDesktop) then
Result.Assign(OldActiveDesktop, False, False);
Result.Assign(TDesktopOpt(OldActiveDesktop), False, False);
end;
procedure TEnvironmentOptions.SetTestBuildDirectory(const AValue: string);