From 236be726c46c7fb47c08b1ea42f60433ca5aa8c1 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Mon, 15 Jul 2019 10:09:06 -0400 Subject: [PATCH] Bug 549066 - NPE in Launch Bar injection when running headless. Adds a check that we actually got an application before doing the injection. Change-Id: Ie3670f1c35d107f8147799a449498e03b950ac00 --- .../launchbar/ui/controls/internal/LaunchBarInjector.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarInjector.java b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarInjector.java index 125c7d6267a..ed4e6f2f724 100644 --- a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarInjector.java +++ b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarInjector.java @@ -38,6 +38,11 @@ public class LaunchBarInjector { @Execute void execute() { + if (application == null) { + // We are running headless, don't need the launch bar here. + return; + } + IPreferenceStore store = Activator.getDefault().getPreferenceStore(); boolean enabled = store.getBoolean(Activator.PREF_ENABLE_LAUNCHBAR); injectIntoAll(enabled);