From 329f20b8c97268d1e429cc005e17998074365de9 Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Thu, 18 Jun 2015 11:19:15 -0400 Subject: [PATCH] launchbar: NPE in ModeSelector is group does not have an image this prevents mode selector from working at all Change-Id: Iefc80b8a71cc4550e35fedb2dadcc450f256cb63 --- .../eclipse/launchbar/ui/internal/controls/ModeSelector.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/ModeSelector.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/ModeSelector.java index 305735601ee..6543f7fa7f7 100644 --- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/ModeSelector.java +++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/ModeSelector.java @@ -84,6 +84,8 @@ public class ModeSelector extends CSelector { } if (group != null) { ImageDescriptor imageDesc = group.getImageDescriptor(); + if (imageDesc == null) + return null; Image image = images.get(imageDesc); if (image == null) { image = imageDesc.createImage();