From 88ce755dbb004820fe48b74e9e8e513d8d23e52e Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Thu, 29 Mar 2007 08:36:14 +0000
Subject: [PATCH] Fix to the tool-chain edit mechanism

---
 .../cdt/managedbuilder/internal/core/FolderInfo.java        | 3 +++
 .../cdt/managedbuilder/ui/properties/ToolChainEditTab.java  | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
index 3ea553f0dec..bdc0d9f914a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
@@ -739,6 +739,9 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
 	}
 
 	public IToolChain changeToolChain(IToolChain newSuperClass, String Id, String name) throws BuildException{
+		if(newSuperClass == null)
+			newSuperClass = ManagedBuildManager.getExtensionToolChain(ConfigurationDataProvider.PREF_TC_ID);
+		
 		IToolChain curReal = ManagedBuildManager.getRealToolChain(toolChain);
 		IToolChain newReal = ManagedBuildManager.getRealToolChain(newSuperClass);
 		
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
index a9eb753d17c..46a411c2ab9 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
@@ -170,9 +170,9 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 			if (cfg.getBuilder().isManagedBuildOn()) {
 				c_toolchain.setText(EMPTY_STR); // unprobable case
 			} else {
-				try {
-					fi.changeToolChain(null, null, null);
-				} catch (BuildException e) {}
+//				try {
+//					fi.changeToolChain(null, null, null);
+//				} catch (BuildException e) {}
 				c_toolchain.select(c_toolchain.getItemCount() - 1);
 			}
 			c_builder.setEnabled(false);