diff options
Diffstat (limited to 'org.eclipse.debug.ui')
2 files changed, 9 insertions, 3 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextMessages.properties index 08378e02c..7e91c895f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextMessages.properties +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/ContextMessages.properties @@ -19,4 +19,6 @@ ContextRunner_15=... #The possible values of {0} is the name of the resource that is the current context i.e. Main.java ContextRunner_16={0} + +#The possible values for {0} are the names of the launch configurations in the current workspace LaunchingResourceManager_0={0} (already running) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java index 8e9e1b55b..0ab90803a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java @@ -225,10 +225,14 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo private String appendLaunched(ILaunchConfiguration config) { ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches(); boolean launched = false; + ILaunchConfiguration tmp = null; for(int i = 0; i < launches.length; i++) { - if(!launches[i].isTerminated() && launches[i].getLaunchConfiguration().equals(config)) { - launched = true; - break; + tmp = launches[i].getLaunchConfiguration(); + if(tmp != null) { + if(!launches[i].isTerminated() && tmp.equals(config)) { + launched = true; + break; + } } } if(launched) { |