# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1252509841 18000
# Node ID 6a656b7f160fa18ae587a1d8f4e35531e20c73ff
# Parent  e6bf0f616b9adf2ba4f299da2cedc57d9a211d00# Parent  34f888c298133d7263f251d221f1353a123af968
daily merge

diff -r e6bf0f616b9a -r 6a656b7f160f core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Tue Sep 08 13:50:49 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Wed Sep 09 10:24:01 2009 -0500
@@ -369,6 +369,7 @@
 			if (sdkPropDlg.open() == SDKPropertiesDialog.OK){
 				sdkListTableViewer.refresh();
 				setSelectedSDKInfoText(sdk);
+				rescanSDKs(false);
 			}
 		} else {
 			MessageDialog.openError(getShell(), Messages.getString("SDKPreferencePage.No_SDK_Selected"), Messages.getString("SDKPreferencePage.No_selected_SDK_detected")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -403,6 +404,10 @@
 	}
 	
 	private void rescanNowButtonAction(){
+		rescanSDKs(true);
+	}
+	
+	private void rescanSDKs(boolean scanForNewPlugins){
 		sdkListTableViewer.getTable().clearAll();
 		sdkListTableViewer.refresh();
 		sdkList.clear();
@@ -418,7 +423,9 @@
 			setSelectedSDKInfoText(sdk);
 		}
 		
-		NewPluginChecker.checkForNewlyInstalledPlugins(SDKUIPlugin.getDefault().getWorkbench());
+		if (scanForNewPlugins){
+			NewPluginChecker.checkForNewlyInstalledPlugins(SDKUIPlugin.getDefault().getWorkbench());
+		}
 	}
 	
 	/**