bug 273450: Wrong dialogs when closing Compare With Each Other... editor

1 files changed, 9 insertions, 0 deletions

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
index 71fe641b7..47e6f5aac 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
@@ -12,6 +12,7 @@ package org.eclipse.compare;
 
 import org.eclipse.compare.contentmergeviewer.IFlushable;
 import org.eclipse.compare.internal.CompareMessages;
+import org.eclipse.compare.internal.IFlushable2;
 import org.eclipse.compare.internal.NullViewer;
 import org.eclipse.compare.internal.Utilities;
 import org.eclipse.compare.structuremergeviewer.ICompareInput;
@@ -354,6 +355,14 @@ public abstract class CompareViewerSwitchingPane extends CompareViewerPane {
 					return flushable;
 			}
 		}
+		if (adapter == IFlushable2.class) {
+			Viewer v= getViewer();
+			if (v != null) {
+				IFlushable2 flushable = (IFlushable2)Utilities.getAdapter(v, IFlushable2.class);
+				if (flushable != null)
+					return flushable;
+			}
+		}
 		return super.getAdapter(adapter);
 	}