commit 2140d34b69b666ec66d36f8939c4b8b2b99af2b5
author Dani Megert <dmegert> Wed May 08 19:52:43 2013 +0200
committer Dani Megert <dmegert> Wed May 08 19:52:43 2013 +0200
tree ec319b0bfe9dcd75e78f1c8e3885a21fec537aa3
parent 5b6c8c6f9731428e3cd0e04e4cc61da21c335968

Fixed bug 407436: 'Overwrite' causes NPE in Compare editor

bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index e0ac759..b1db005 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -3011,8 +3011,10 @@
 				public IStatus runInUIThread(IProgressMonitor monitor) {
 					if (!getControl().isDisposed()) {
 						doDiff();
-						invalidateLines();
-						updateLines(doc);
+						if (!getControl().isDisposed()) { // doDiff() might have closed the editor
+							invalidateLines();
+							updateLines(doc);
+						}
 					}
 					return Status.OK_STATUS;
 				}