diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java index 07289235c08..33e39b8e258 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java @@ -192,7 +192,7 @@ public class AbstractAnnotationHover extends AbstractCEditorTextHover { @Override public void setFocus() { super.setFocus(); - if (fFocusControl != null) + if (fFocusControl != null && !fFocusControl.isDisposed()) fFocusControl.setFocus(); }