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

git-svn-id: trunk@52981 -
This commit is contained in:
juha 2016-09-16 09:42:18 +00:00
parent f1a3d2d51e
commit 50553a53dd

View File

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