mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-12 19:45:22 +02:00
Code Issues Wiki Activity

Bug 494427 - fix NPE in launch active.

Browse source 
Change-Id: I97e150b2c457702208b714dd7870955dc9e70067
This commit is contained in:
Doug Schaefer 2016-05-24 10:47:12 -04:00 • committed by Gerrit Code Review @ Eclipse.org
parent a91b8a801a
commit c4d7ecfc60
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/commands/LaunchActiveCommandHandler.java
View file

@ -29,9 +29,14 @@ public class LaunchActiveCommandHandler extends AbstractHandler {
ILaunchBarManager launchBarManager = Activator.getService(ILaunchBarManager.class); ILaunchBarManager launchBarManager = Activator.getService(ILaunchBarManager.class);
StopActiveCommandHandler.stopActiveLaunches(launchBarManager); StopActiveCommandHandler.stopActiveLaunches(launchBarManager);
ILaunchConfiguration config = launchBarManager.getActiveLaunchConfiguration(); ILaunchConfiguration config = launchBarManager.getActiveLaunchConfiguration();
if (config == null) if (config == null) {
return Status.OK_STATUS; return Status.OK_STATUS;
}
ILaunchMode launchMode = launchBarManager.getActiveLaunchMode(); ILaunchMode launchMode = launchBarManager.getActiveLaunchMode();
if (launchMode == null) {
return Status.OK_STATUS;
}
DebugUITools.launch(config, launchMode.getIdentifier()); DebugUITools.launch(config, launchMode.getIdentifier());
return Status.OK_STATUS; return Status.OK_STATUS;

15
pom.xml
View file

@ -219,11 +219,6 @@
<ws>gtk</ws> <ws>gtk</ws>
<arch>x86_64</arch> <arch>x86_64</arch>
</environment> </environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>ppc64</arch>
</environment>
<environment> <environment>
<os>win32</os> <os>win32</os>
<ws>win32</ws> <ws>win32</ws>
@ -239,16 +234,6 @@
<ws>cocoa</ws> <ws>cocoa</ws>
<arch>x86_64</arch> <arch>x86_64</arch>
</environment> </environment>
<environment>
<os>aix</os>
<ws>gtk</ws>
<arch>ppc</arch>
</environment>
<environment>
<os>solaris</os>
<ws>gtk</ws>
<arch>sparc</arch>
</environment>
</environments> </environments>
</configuration> </configuration>
</plugin> </plugin>