Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2010-05-11 13:27:50 -0400
committerAndrew Niefer2010-05-11 13:27:50 -0400
commit1237ef41dfe4f61c3c0bc9999b18d2c7dd3f1cc9 (patch)
treec021a8be40c1ae749bd8cb08b28b0235f5f26468 /bundles/org.eclipse.equinox.p2.touchpoint.eclipse
parentbae88e0807987e3625db8dafd332386f2ded09d5 (diff)
downloadrt.equinox.p2-1237ef41dfe4f61c3c0bc9999b18d2c7dd3f1cc9.tar.gz
rt.equinox.p2-1237ef41dfe4f61c3c0bc9999b18d2c7dd3f1cc9.tar.xz
rt.equinox.p2-1237ef41dfe4f61c3c0bc9999b18d2c7dd3f1cc9.zip
bug 311332 - NPE uninstalling launcher
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.touchpoint.eclipse')
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java
index 01220b8ea..c9101fe01 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetLauncherNameAction.java
@@ -42,7 +42,10 @@ public class SetLauncherNameAction extends ProvisioningAction {
private static void setLauncher(Manipulator manipulator, IProfile profile, String launcherName) {
//Get the launcherData before changing the name so we don't lose anything from the old launcher.ini
LauncherData launcherData = manipulator.getLauncherData();
- ((Profile) profile).setProperty(EclipseTouchpoint.PROFILE_PROP_LAUNCHER_NAME, launcherName);
+ if (launcherName != null)
+ ((Profile) profile).setProperty(EclipseTouchpoint.PROFILE_PROP_LAUNCHER_NAME, launcherName);
+ else
+ ((Profile) profile).removeProperty(EclipseTouchpoint.PROFILE_PROP_LAUNCHER_NAME);
launcherData.setLauncher(Util.getLauncherPath(profile));
}
} \ No newline at end of file

Back to the top