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

IDE: Fix auto-saving desktops when debug-desktop is defined or when a desktop is deleted. Issue #30602, patch from Michl.

Browse Source 
git-svn-id: trunk@52981 -
This commit is contained in:
juha 2016-09-16 09:42:18 +00:00
parent f1a3d2d51e
commit 50553a53dd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ide/environmentopts.pp
View File

@ -1525,11 +1525,12 @@ end;
procedure TEnvironmentOptions.EnableDebugDesktop; procedure TEnvironmentOptions.EnableDebugDesktop;
begin begin
if not Assigned(FLastDesktopBeforeDebug) and Assigned(DebugDesktop) then if not Assigned(FLastDesktopBeforeDebug) and Assigned(DebugDesktop) and (DebugDesktop <> ActiveDesktop) then
begin begin
FLastDesktopBeforeDebug := TDesktopOpt.Create(''); FLastDesktopBeforeDebug := TDesktopOpt.Create('');
FLastDesktopBeforeDebug.Assign(Desktop); if AutoSaveActiveDesktop then
FLastDesktopBeforeDebug.Name := ActiveDesktopName; Desktop.ImportSettingsFromIDE;
FLastDesktopBeforeDebug.Assign(Desktop, True);
EnvironmentOptions.UseDesktop(DebugDesktop); EnvironmentOptions.UseDesktop(DebugDesktop);
end; end;
end; end;