diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java index 5e9624227ea..07f17c28057 100644 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java +++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java @@ -712,10 +712,11 @@ public class DOMAST extends ViewPart { private IEditorPart getActiveEditor() { IEditorPart editor = null; - if (getSite().getPage().isEditorAreaVisible()) { + if (getSite().getPage().isEditorAreaVisible() && + getSite().getPage().getActiveEditor() != null) { editor = getSite().getPage().getActiveEditor(); part = editor; - lang = lang = getLanguageFromFile(((CEditor)editor).getInputFile()); + lang = getLanguageFromFile(((CEditor)editor).getInputFile()); } return editor;