diff --git a/java/compiler/impl/src/com/intellij/build/AbstractViewManager.java b/java/compiler/impl/src/com/intellij/build/AbstractViewManager.java index fd514c47c343..cc29b806c060 100644 --- a/java/compiler/impl/src/com/intellij/build/AbstractViewManager.java +++ b/java/compiler/impl/src/com/intellij/build/AbstractViewManager.java @@ -221,6 +221,7 @@ public abstract class AbstractViewManager implements BuildProgressListener, Disp @Override public void update(@NotNull AnActionEvent e) { + if(!myContent.isValid()) return; Boolean isPinnedAndExtracted = myContent.getUserData(PINNED_EXTRACTED_CONTENT); if (isPinnedAndExtracted == Boolean.TRUE) { e.getPresentation().setEnabledAndVisible(false); @@ -264,6 +265,7 @@ public abstract class AbstractViewManager implements BuildProgressListener, Disp public void actionPerformed(AnActionEvent e) { if (myBuildsView == null) return; Content content = myBuildsView.getContent(); + if(!content.isValid()) return; final boolean removedOk = content.getManager().removeContent(content, true); if (removedOk) { if (myBuildsViewValue.getValue() == myBuildsView) { @@ -278,7 +280,7 @@ public abstract class AbstractViewManager implements BuildProgressListener, Disp @Override public void update(AnActionEvent e) { - if (myBuildsView.hasRunningBuilds()) { + if (myBuildsView != null && myBuildsView.hasRunningBuilds()) { e.getPresentation().setEnabled(false); } else {