From f89c3c30038b7c0dd113c94a5837b1c6526a9efd Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Mon, 5 Apr 2021 13:52:56 -0400
Subject: [PATCH] Fix NPE in LaunchBarManager

This comes up when doing headless DSF-GDB tests, not sure users can
hit it, but rather than logging an NPE, just check for it upfront.

Change-Id: I224b7e3a881c5e7bc2e1c1b00c1c3da58c745567
---
 launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF  | 2 +-
 .../eclipse/launchbar/core/internal/LaunchBarManager.java  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
index 605aa0c27b2..9ce99da641c 100644
--- a/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.launchbar.core;singleton:=true
-Bundle-Version: 2.4.100.qualifier
+Bundle-Version: 2.4.200.qualifier
 Bundle-Activator: org.eclipse.launchbar.core.internal.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/launchbar/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java b/launchbar/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
index c35a0729022..b6d828fbde5 100644
--- a/launchbar/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
+++ b/launchbar/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
@@ -932,8 +932,11 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchTargetListene
 			for (LaunchConfigProviderInfo providerInfo : configProviders.get(descTypeInfo.getId())) {
 				try {
 					if (providerInfo.enabled(configuration)) {
-						if (providerInfo.getProvider().launchConfigurationChanged(configuration)) {
-							return;
+						ILaunchConfigurationProvider provider = providerInfo.getProvider();
+						if (provider != null) {
+							if (provider.launchConfigurationChanged(configuration)) {
+								return;
+							}
 						}
 					}
 				} catch (Throwable e) {