MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed NPE

Browse Source
This commit is contained in:
Serega Vasiliev
2012-02-07 13:47:54 +01:00
parent e169f65fb0
commit 75654a3490
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
+3 -4
View File
@@ -48,6 +48,7 @@ import com.intellij.openapi.wm.ToolWindowManager;
import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
import com.intellij.ui.content.*;
import com.intellij.ui.content.impl.ContentImpl;
import com.intellij.ui.docking.DockManager;
import com.intellij.util.concurrency.Semaphore;
import com.intellij.util.containers.ContainerUtil;
@@ -279,13 +280,11 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
getSyncPublisher().contentRemoved(oldDescriptor, executor);
oldDescriptor.dispose(); // is of the same category, can be reused
}
else if (descriptor.getAttachedContent() == null) {
else {
content = createNewContent(contentManager, descriptor, executor);
final Icon icon = descriptor.getIcon();
content.setIcon(icon == null ? executor.getToolWindowIcon() : icon);
} else {
content = descriptor.getAttachedContent();
}
}
content.setComponent(descriptor.getComponent());
content.putUserData(DESCRIPTOR_KEY, descriptor);