diff options
| -rw-r--r-- | launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java index bbb320269c2..9181202404f 100644 --- a/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java +++ b/launch/org.eclipse.cdt.launchbar.ui/src/org/eclipse/cdt/launchbar/ui/internal/controls/ConfigSelector.java @@ -110,7 +110,9 @@ public class ConfigSelector extends CSelector { ILaunchDescriptor configDesc = (ILaunchDescriptor)element; ILabelProvider labelProvider = uiManager.getLabelProvider(configDesc); if (labelProvider != null) { - return labelProvider.getImage(element); + Image img = labelProvider.getImage(element); + if (img != null) + return img; } } return defaultProvider.getImage(element); @@ -123,7 +125,9 @@ public class ConfigSelector extends CSelector { ILaunchDescriptor configDesc = (ILaunchDescriptor)element; ILabelProvider labelProvider = uiManager.getLabelProvider(configDesc); if (labelProvider != null) { - return labelProvider.getText(element); + String text = labelProvider.getText(element); + if (text != null) + return text; } } return defaultProvider.getText(element); |