Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2013-05-08 13:52:43 -0400
committerDani Megert2013-05-08 13:52:43 -0400
commit2140d34b69b666ec66d36f8939c4b8b2b99af2b5 (patch)
treeec319b0bfe9dcd75e78f1c8e3885a21fec537aa3
parent5b6c8c6f9731428e3cd0e04e4cc61da21c335968 (diff)
downloadeclipse.platform.team-I20130511-1500.tar.gz
eclipse.platform.team-I20130511-1500.tar.xz
eclipse.platform.team-I20130511-1500.zip
Fixed bug 407436: 'Overwrite' causes NPE in Compare editorI20130512-2000I20130511-1500I20130510-2000I20130509-2000I20130508-2000
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java6
1 files changed, 4 insertions, 2 deletions
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 e0ac759bd..b1db00552 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 class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
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;
}

Back to the top