Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2005-05-12 07:47:48 +0000
committerAndre Weinand2005-05-12 07:47:48 +0000
commit4e5d4a7e9c22788858d235741078b44f601b2bbc (patch)
tree82504bd52900e5e6f9168743354db2db2819c82f /bundles/org.eclipse.compare/plugins
parent4a964335dde5e91bddc6ef2f527350b9d85b3754 (diff)
downloadeclipse.platform.team-4e5d4a7e9c22788858d235741078b44f601b2bbc.tar.gz
eclipse.platform.team-4e5d4a7e9c22788858d235741078b44f601b2bbc.tar.xz
eclipse.platform.team-4e5d4a7e9c22788858d235741078b44f601b2bbc.zip
fixed #94420: [Preferences] Widget is disposed in Compare/Patch
Diffstat (limited to 'bundles/org.eclipse.compare/plugins')
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html3
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index b4c6a4860..d12f09451 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -12,7 +12,7 @@
Eclipse Platform Build Notes<br>
Compare</h1>
-Eclipse Build Input May 10th 2005
+Eclipse Build Input May 12th 2005
<h2>Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93561">93561</a>: ResouceMapping changed to Internal<br>
@@ -26,6 +26,7 @@ Eclipse Build Input May 10th 2005
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91211">91211</a>: Apply patch doesn't work for files with missing line endings<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=92270">92270</a>: compare should use content-based content type matching<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=69920">69920</a>: Compare should show png, bmp, etc. as image<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94420">94420</a>: [Preferences] Widget is disposed in Compare/Patch<br>
<h1><hr WIDTH="100%"></h1>
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 d402c0029..fbcf94137 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
@@ -3763,7 +3763,7 @@ public class TextMergeViewer extends ContentMergeViewer {
// if (d == fCurrentDiff)
// return;
- if (fCenterButton != null)
+ if (fCenterButton != null && !fCenterButton.isDisposed())
fCenterButton.setVisible(false);
fEndOfDocReached= false;

Back to the top