1 files changed, 6 insertions, 7 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
index 97eee797d5f..75964cc2bc3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
@@ -126,6 +126,12 @@ public class ToolChainPreferencePage extends PreferencePage implements IWorkbenc
 		availTable.setContentProvider(new IStructuredContentProvider() {
 			@Override
 			public Object[] getElements(Object inputElement) {
+				toolChains = new ArrayList<IToolChain>();
+				try {
+					toolChains.addAll(manager.getAllToolChains());
+				} catch (CoreException e) {
+					CUIPlugin.log(e.getStatus());
+				}
 				return toolChains.toArray();
 			}
 		});
@@ -282,13 +288,6 @@ public class ToolChainPreferencePage extends PreferencePage implements IWorkbenc
 			}
 		});
 
-		toolChains = new ArrayList<IToolChain>();
-		try {
-			toolChains.addAll(manager.getAllToolChains());
-		} catch (CoreException e) {
-			CUIPlugin.log(e.getStatus());
-		}
-
 		availTable.setInput(manager);
 		userTable.setInput(manager);
 		updateButtons();