Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2022-01-21 09:35:34 +0000
committerAndrey Loskutov2022-01-21 10:00:37 +0000
commitb96ecaa5ace2c6edd5e08c7cb6aa630992e5a461 (patch)
tree52cc7437e95853aa697b8e982499fa787e3c8863
parent2a735980f649f352a023aa29d66ce8136e02b3b0 (diff)
downloadeclipse.platform.team-I20220126-0520.tar.gz
eclipse.platform.team-I20220126-0520.tar.xz
eclipse.platform.team-I20220126-0520.zip
Change-Id: I7e1b688a8b365375ccf5531d4631525ee2f661c0 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.team/+/189865 Tested-by: Platform Bot <platform-bot@eclipse.org>
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index 9f8c8a74b..276d0ca70 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -736,6 +736,9 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
public static Image getImage(IAdaptable adaptable) {
if (adaptable != null) {
IWorkbenchAdapter o= Adapters.adapt(adaptable, IWorkbenchAdapter.class);
+ if (o == null) {
+ return null;
+ }
ImageDescriptor id= o.getImageDescriptor(adaptable);
if (id != null) {
Image image= fgImages2.get(id);

Back to the top