diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java index eba0f9d17903..fbb200453c13 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java @@ -120,6 +120,8 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware { @NotNull final AbstractVcs vcs, @NotNull final UpToDateLineNumberProvider upToDateLineNumbers, final boolean warnAboutSuspiciousAnnotations) { + if (project.isDisposed() || editor.isDisposed()) return; + if (warnAboutSuspiciousAnnotations) { int expectedLines = Math.max(upToDateLineNumbers.getLineCount(), 1); int actualLines = Math.max(fileAnnotation.getLineCount(), 1);