diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index 8c7b687687d..27b9062ad22 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -1366,7 +1366,10 @@ public class CEditor extends AbstractTextEditor implements ISelectionChangedList * Uninstalls this manager. */ private void uninstall() { - getTextWidget().removeVerifyKeyListener(this); + StyledText textWidget = getTextWidget(); + if (textWidget != null && !textWidget.isDisposed()) { + textWidget.removeVerifyKeyListener(this); + } } };