| commit | 680c0245fcd25dca65b81763320f9c082529e159 | [log] [tgz] |
|---|---|---|
| author | Andrey Loskutov <loskutov@gmx.de> | Thu Aug 05 16:59:32 2021 +0200 |
| committer | Andrey Loskutov <loskutov@gmx.de> | Thu Aug 05 11:12:44 2021 -0400 |
| tree | b71424324d13677a40f1bb9ca018121703972525 | |
| parent | b5e22c9e83cfb9a40192f9c4a5ebb12de06ddc5a [diff] |
Bug 375870 - ImageMergeViewer leaks images Change-Id: I177b2b4abb79b03bb690eb81e85e7a4f1338eaf6 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.team/+/183739 Tested-by: Platform Bot <platform-bot@eclipse.org>
diff --git a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index ee2fc21..74270ae 100644 --- a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ 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 bc0ec4c..ced347d 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 @@ } } - 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 aa9ad96..bf9125c 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>