Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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