From 304ed9832df9d7e7c2bb98126510a3c07dd0213c Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Thu, 27 Jun 2019 23:17:22 +0000
Subject: [PATCH] IDE: Fix assigning a debug desktop. Issue #35778, patch from
 FTurtle.

git-svn-id: trunk@61486 -
---
 ide/desktopmanager.pas | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ide/desktopmanager.pas b/ide/desktopmanager.pas
index f654fbbc3e..745244e36b 100644
--- a/ide/desktopmanager.pas
+++ b/ide/desktopmanager.pas
@@ -192,7 +192,8 @@ begin
     Exit;
   end;
 
-  if EnvironmentOptions.DebugDesktopName = aDesktopName then
+  if (EnvironmentOptions.DebugDesktopName = aDesktopName) or
+      (EnvironmentOptions.ActiveDesktopName = aDesktopName) then
     EnvironmentOptions.DebugDesktopName := ''
   else
     EnvironmentOptions.DebugDesktopName := aDesktopName;