Improved fix for bug 337719: [implementation] AbstractTextEditor does not prompt when out of sync in MultiPageEditorPart
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
index 0ab873e..01b4c60 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
@@ -978,7 +978,7 @@
if (fIsHandlingActivation)
return;
- if (fActivePart == AbstractTextEditor.this || fActivePart.getAdapter(AbstractTextEditor.class) == AbstractTextEditor.this) {
+ if (fActivePart == AbstractTextEditor.this || fActivePart != null && fActivePart.getAdapter(AbstractTextEditor.class) == AbstractTextEditor.this) {
fIsHandlingActivation= true;
try {
safelySanityCheckState(getEditorInput());
