|
13 | 13 |
|
14 | 14 | package ilg.gnuarmeclipse.managedbuild.cross.ui;
|
15 | 15 |
|
16 |
| -import ilg.gnuarmeclipse.core.EclipseUtils; |
17 |
| -import ilg.gnuarmeclipse.managedbuild.cross.Activator; |
18 |
| -import ilg.gnuarmeclipse.managedbuild.cross.IDs; |
19 |
| -import ilg.gnuarmeclipse.managedbuild.cross.Option; |
20 |
| -import ilg.gnuarmeclipse.managedbuild.cross.ToolchainDefinition; |
21 |
| -import ilg.gnuarmeclipse.managedbuild.cross.Utils; |
22 |
| -import ilg.gnuarmeclipse.managedbuild.cross.preferences.GlobalToolsPathsPreferencePage; |
23 |
| -import ilg.gnuarmeclipse.managedbuild.cross.preferences.WorkspaceToolsPathsPreferencePage; |
24 |
| -import ilg.gnuarmeclipse.managedbuild.cross.properties.ProjectToolsPathPropertyPage; |
25 |
| - |
26 | 16 | import org.eclipse.cdt.core.settings.model.ICResourceDescription;
|
27 | 17 | import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
|
28 | 18 | import org.eclipse.cdt.managedbuilder.core.BuildException;
|
|
59 | 49 | import org.eclipse.swt.widgets.Text;
|
60 | 50 | import org.eclipse.ui.dialogs.PreferencesUtil;
|
61 | 51 |
|
| 52 | +import ilg.gnuarmeclipse.core.EclipseUtils; |
| 53 | +import ilg.gnuarmeclipse.managedbuild.cross.Activator; |
| 54 | +import ilg.gnuarmeclipse.managedbuild.cross.IDs; |
| 55 | +import ilg.gnuarmeclipse.managedbuild.cross.Option; |
| 56 | +import ilg.gnuarmeclipse.managedbuild.cross.ToolchainDefinition; |
| 57 | +import ilg.gnuarmeclipse.managedbuild.cross.Utils; |
| 58 | +import ilg.gnuarmeclipse.managedbuild.cross.preferences.GlobalToolsPathsPreferencePage; |
| 59 | +import ilg.gnuarmeclipse.managedbuild.cross.preferences.WorkspaceToolsPathsPreferencePage; |
| 60 | +import ilg.gnuarmeclipse.managedbuild.cross.properties.ProjectToolsPathPropertyPage; |
| 61 | + |
62 | 62 | /**
|
63 | 63 | * @noextend This class is not intended to be subclassed by clients.
|
64 | 64 | * @noinstantiate This class is not intended to be instantiated by clients.
|
@@ -538,9 +538,15 @@ protected void performApply(ICResourceDescription src,
|
538 | 538 | if (Activator.getInstance().isDebugging()) {
|
539 | 539 | System.out.println("TabToolchains.performApply() " + src.getName());
|
540 | 540 | }
|
541 |
| - IConfiguration config = getCfg(src.getConfiguration()); |
542 | 541 |
|
543 |
| - updateOptions(config); |
| 542 | + // need to apply changes in both configurations |
| 543 | + // dst is the new description, will be used when saving changes on disk (set project description) |
| 544 | + // src is the old description used in current page |
| 545 | + IConfiguration config1 = getCfg(src.getConfiguration()); |
| 546 | + IConfiguration config2 = getCfg(dst.getConfiguration()); |
| 547 | + updateOptions(config1); |
| 548 | + updateOptions(config2); |
| 549 | + |
544 | 550 | // does not work like this
|
545 | 551 | // SpecsProvider.clear();
|
546 | 552 |
|
|
0 commit comments