# HG changeset patch
# User timkelly
# Date 1275062971 18000
# Node ID 9cca70448cde1f96c2f5c0fb92173debd218fcd6
# Parent  b3a85ee0b02211d45733126ff59edb21e108d212# Parent  b5d7b821ee95618c7814f40722347f53e75b76e6
merge commit

diff -r b5d7b821ee95 -r 9cca70448cde core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java	Fri May 28 09:54:47 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java	Fri May 28 11:09:31 2010 -0500
@@ -236,11 +236,10 @@
 			public void widgetSelected(SelectionEvent e) {
 				// I don't see a way to open it to a specific tab, only the page
 				if (Window.OK == PreferencesUtil.createPreferenceDialogOn(getShell(), "com.nokia.carbide.cpp.sdk.ui.preferences.BuildPlatformFilterPage", null, null, 0).open()){ //$NON-NLS-1$
+					
 					inited = false;
 					setVisible(true);
-					drawSDKConfigView(getControl().getParent());
-					TemplateSDKFilter filter = filterCheckbox.getSelection() ? templateFilter
-							: null;
+					TemplateSDKFilter filter = filterCheckbox.getSelection() ? templateFilter : null;
 					filteringContentProviderWrapper.setFilter(filter);
 					viewer.getTree().clearAll(true);
 					viewer.refresh();
@@ -255,11 +254,10 @@
 	
 	private void drawSDKConfigView(Composite parent) {
 		
-		if (viewer == null){
-			viewer = new ContainerCheckedTreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-			viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-			viewer.setLabelProvider(new LabelProvider());
-		}
+		viewer = new ContainerCheckedTreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+		viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
+		viewer.setLabelProvider(new LabelProvider());
+		
 		TreeNodeContentProvider treeNodeContentProvider = new TreeNodeContentProvider();
 		filteringContentProviderWrapper = 
 			new FilteringContentProviderWrapper(treeNodeContentProvider);