From de43afb5b886f1c762161b1bae0b12aec07c8495 Mon Sep 17 00:00:00 2001 From: Matthew Bastien Date: Tue, 4 Apr 2017 12:41:10 -0400 Subject: [PATCH] Avoid setting active target to ILaunchTarget.NULL_TARGET Sometimes the active target would be set to a null "---" target when switching between launch descriptors even though a valid non-null launch target could be selected. Added a check to syncActiveTarget() in order to prevent this scenario from happening. Change-Id: Ife75701e8753123e6b1c5202b7bda339c6bfafd4 Signed-off-by: Matthew Bastien --- .../org/eclipse/launchbar/core/internal/LaunchBarManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java b/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java index 99aa6346ac2..9e78d132972 100644 --- a/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java +++ b/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java @@ -525,7 +525,8 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchTargetListene } } else { // current active target, check if it is supported - if (activeLaunchTarget != null && supportsTarget(activeLaunchDesc, activeLaunchTarget)) { + if (activeLaunchTarget != null && activeLaunchTarget != ILaunchTarget.NULL_TARGET + && supportsTarget(activeLaunchDesc, activeLaunchTarget)) { setActiveLaunchTarget(activeLaunchTarget); return; }