diff options
Diffstat (limited to 'bundles')
3 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index ee2fc2198..74270ae5c 100644 --- a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare; singleton:=true -Bundle-Version: 3.8.0.qualifier +Bundle-Version: 3.8.100.qualifier Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java index bc0ec4cbe..ced347d45 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java @@ -104,8 +104,10 @@ public class ImageMergeViewer extends ContentMergeViewer { } } - canvas.setImage(image); if (image != null) { + Image nonNullImage = image; + canvas.setImage(nonNullImage); + canvas.addDisposeListener(e -> nonNullImage.dispose()); canvas.setBackground(display.getSystemColor(SWT.COLOR_LIST_BACKGROUND)); } else { canvas.setBackground(null); diff --git a/bundles/org.eclipse.compare/pom.xml b/bundles/org.eclipse.compare/pom.xml index aa9ad9619..bf9125c80 100644 --- a/bundles/org.eclipse.compare/pom.xml +++ b/bundles/org.eclipse.compare/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.compare</groupId> <artifactId>org.eclipse.compare</artifactId> - <version>3.8.0-SNAPSHOT</version> + <version>3.8.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |