From d9013538b80e12601583aab84bfd9417b3a7a5bc Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Sun, 13 Jul 2014 20:38:58 -0400 Subject: [PATCH] Fix loading of the active descriptor in the launchbar. --- .../cdt/launchbar/core/internal/LaunchBarManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java index adc6a14c65c..97cbf581092 100644 --- a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java +++ b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java @@ -137,6 +137,10 @@ public class LaunchBarManager extends PlatformObject implements ILaunchBarManage } }); + // Load up the active from the preferences before loading the descriptors + IEclipsePreferences store = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID); + String activeConfigDescName = store.get(PREF_ACTIVE_CONFIG_DESC, null); + for (ILaunchDescriptorType descriptorType : descriptorTypes) { descriptorType.init(this); } @@ -162,9 +166,7 @@ public class LaunchBarManager extends PlatformObject implements ILaunchBarManage } launchManager.addLaunchConfigurationListener(this); - // Load up the active from the preferences or pick reasonable defaults - IEclipsePreferences store = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID); - String activeConfigDescName = store.get(PREF_ACTIVE_CONFIG_DESC, null); + // Now that all the descriptors are loaded, set the one if (activeConfigDescName == null && !descriptors.isEmpty()) { activeConfigDescName = descriptors.values().iterator().next().getName(); }