Bug 42741 - Config classpath does not update for change in global Ant home
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathTab.java
index 8292bce..10e8ab1 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathTab.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntClasspathTab.java
@@ -140,13 +140,14 @@
 	 */
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		
-		configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_HOME, antClasspathBlock.getAntHome());
-				
 		if (useDefaultButton.getSelection()) {
 			configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_CUSTOM_CLASSPATH, (String)null);
+			configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_HOME, (String)null);
 			return;
 		}
 		
+		configuration.setAttribute(IAntLaunchConfigurationConstants.ATTR_ANT_HOME, antClasspathBlock.getAntHome());
+		
 		List antUrls= antClasspathBlock.getAntURLs();
 		List userUrls= antClasspathBlock.getUserURLs();
 		StringBuffer urlString= new StringBuffer();
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathBlock.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathBlock.java
index 712e7e5..28013e8 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathBlock.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntClasspathBlock.java
@@ -654,7 +654,8 @@
 			AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
 			antTableViewer.setInput(prefs.getAntURLs());
 			userTableViewer.setInput(prefs.getCustomURLs());
-			initializeAntHome(prefs.getDefaultAntHome());
+			initializing= true;
+			initializeAntHome(prefs.getAntHome());
 			antHome.setEnabled(false);
 			browseAntHomeButton.setEnabled(false);
 		}