From a0072f9608db2acbca725ce7645b9b5950b901a4 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Fri, 14 Aug 2015 20:28:28 +0300 Subject: [PATCH] EA-71665 - IAE: ContentManagerImpl.setSelectedContent --- .../xdebugger/impl/ui/DebuggerSessionTabBase.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java index df0dcd9a16e4..ea923753097b 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java @@ -37,6 +37,8 @@ import com.intellij.openapi.wm.ToolWindow; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.AppIcon; import com.intellij.ui.content.Content; +import com.intellij.ui.content.ContentManager; +import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import com.intellij.xdebugger.XDebuggerBundle; import org.jetbrains.annotations.NotNull; @@ -102,8 +104,10 @@ public abstract class DebuggerSessionTabBase extends RunTab { ToolWindow toolWindow = ExecutionManager.getInstance(myProject).getContentManager() .getToolWindowByDescriptor(myRunContentDescriptor); Content content = myRunContentDescriptor.getAttachedContent(); - if (toolWindow != null && content != null && !toolWindow.getContentManager().isSelected(content)) { - toolWindow.getContentManager().setSelectedContent(content); + if (toolWindow == null || content == null) return; + ContentManager manager = toolWindow.getContentManager(); + if (ArrayUtil.contains(content, manager.getContents()) && !manager.isSelected(content)) { + manager.setSelectedContent(content); } } } -- 2.32.0