1 files changed, 6 insertions, 8 deletions

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 6dfe9b810..b73e30fbc 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -1651,12 +1651,10 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable  {
 		if (RESOLVED == null)
 			RESOLVED= new RGB(0, 255, 0);	// GREEN
 
-		updatePresentation(display);
+		updatePresentation();
 	}
 
-	private void updatePresentation(Display display) {
-		if (display == null)
-			display= fComposite.getDisplay();
+	private void updatePresentation() {
 		refreshBirdsEyeView();
 		invalidateLines();
 		invalidateTextPresentation();
@@ -3315,6 +3313,8 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable  {
 	//---- update UI stuff
 
 	private void updateControls() {
+		if (getControl().isDisposed())
+			return;
 
 		boolean leftToRight= false;
 		boolean rightToLeft= false;
@@ -3694,7 +3694,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable  {
 		} else if (key.equals(ComparePreferencePage.HIGHLIGHT_TOKEN_CHANGES)) {
 			fHighlightTokenChanges= fPreferenceStore.getBoolean(ComparePreferencePage.HIGHLIGHT_TOKEN_CHANGES);
 			updateResolveStatus();
-			updatePresentation(null);
+			updatePresentation();
 
 			//		} else if (key.equals(ComparePreferencePage.USE_RESOLVE_UI)) {
 			//			fUseResolveUI= fPreferenceStore.getBoolean(ComparePreferencePage.USE_RESOLVE_UI);
@@ -4424,8 +4424,6 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable  {
 		if (fCenterButton != null && !fCenterButton.isDisposed())
 			fCenterButton.setVisible(false);
 
-		Diff oldDiff= fCurrentDiff;
-
 		if (d != null && revealAndSelect) {
 
 			// before we set fCurrentDiff we change the selection
@@ -4980,7 +4978,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable  {
 			updateControls();
 
 		updateVScrollBar();
-		updatePresentation(null);
+		updatePresentation();
 	}
 
 	private void resetDiffs() {