fix Apply button in Toolchains tab

issue #90
When pressing Apply button the changes are saved in the project
description.

Signed-off-by: Iulia Vasii <[email protected]>

Author: iulia-vasii

ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ui/TabToolchains.java

@@ -13,16 +13,6 @@
 
 package ilg.gnuarmeclipse.managedbuild.cross.ui;
 
-import ilg.gnuarmeclipse.core.EclipseUtils;
-import ilg.gnuarmeclipse.managedbuild.cross.Activator;
-import ilg.gnuarmeclipse.managedbuild.cross.IDs;
-import ilg.gnuarmeclipse.managedbuild.cross.Option;
-import ilg.gnuarmeclipse.managedbuild.cross.ToolchainDefinition;
-import ilg.gnuarmeclipse.managedbuild.cross.Utils;
-import ilg.gnuarmeclipse.managedbuild.cross.preferences.GlobalToolsPathsPreferencePage;
-import ilg.gnuarmeclipse.managedbuild.cross.preferences.WorkspaceToolsPathsPreferencePage;
-import ilg.gnuarmeclipse.managedbuild.cross.properties.ProjectToolsPathPropertyPage;
-
 import org.eclipse.cdt.core.settings.model.ICResourceDescription;
 import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
 import org.eclipse.cdt.managedbuilder.core.BuildException;
@@ -59,6 +49,16 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.PreferencesUtil;
 
+import ilg.gnuarmeclipse.core.EclipseUtils;
+import ilg.gnuarmeclipse.managedbuild.cross.Activator;
+import ilg.gnuarmeclipse.managedbuild.cross.IDs;
+import ilg.gnuarmeclipse.managedbuild.cross.Option;
+import ilg.gnuarmeclipse.managedbuild.cross.ToolchainDefinition;
+import ilg.gnuarmeclipse.managedbuild.cross.Utils;
+import ilg.gnuarmeclipse.managedbuild.cross.preferences.GlobalToolsPathsPreferencePage;
+import ilg.gnuarmeclipse.managedbuild.cross.preferences.WorkspaceToolsPathsPreferencePage;
+import ilg.gnuarmeclipse.managedbuild.cross.properties.ProjectToolsPathPropertyPage;
+
 /**
  * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
@@ -538,9 +538,15 @@ protected void performApply(ICResourceDescription src,
 		if (Activator.getInstance().isDebugging()) {
 			System.out.println("TabToolchains.performApply() " + src.getName());
 		}
-		IConfiguration config = getCfg(src.getConfiguration());
 
-		updateOptions(config);
+		// need to apply changes in both configurations
+		// dst is the new description, will be used when saving changes on disk (set project description)
+		// src is the old description used in current page
+		IConfiguration config1 = getCfg(src.getConfiguration());
+		IConfiguration config2 = getCfg(dst.getConfiguration());
+		updateOptions(config1);
+		updateOptions(config2);
+
 		// does not work like this
 		// SpecsProvider.clear();