--- a/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/core/HoverManager.java	Tue Jun 08 11:38:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/core/HoverManager.java	Mon Jun 21 14:35:21 2010 -0500
@@ -23,7 +23,6 @@
 import com.nokia.carbide.cpp.sysdoc.internal.hover.dal.interX.InterXIndexController;
 import com.nokia.carbide.cpp.sysdoc.internal.hover.dal.sdk.SDKController;
 import com.nokia.carbide.cpp.sysdoc.internal.hover.preferences.PreferencesPageController;
-import com.nokia.carbide.cpp.sysdoc.internal.hover.uitlis.DialogHelper;
 import com.nokia.carbide.cpp.sysdoc.internal.hover.uitlis.Logger;
 import com.nokia.carbide.cpp.sysdoc.internal.hover.webserver.IEmbeddedWebServer;
 import com.nokia.carbide.cpp.sysdoc.internal.hover.webserver.JettyWebServer;
@@ -101,7 +100,9 @@
 	public void haltHoveringService(final String msg) {
 		HoverManager.getInstance().setEnabled(false);
 		PreferencesPageController.setDeActivateHoverPlugin(true);
-		DialogHelper.displayErrorDialog(MessagesConstants.DEACTIVATED + msg);
+
+		// don't show error dialog here - fixes bug #10130
+		// DialogHelper.displayErrorDialog(MessagesConstants.DEACTIVATED + msg);
 	}
 
 	/**

--- a/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/dal/sdk/SDKController.java	Tue Jun 08 11:38:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/src/com/nokia/carbide/cpp/sysdoc/internal/hover/dal/sdk/SDKController.java	Mon Jun 21 14:35:21 2010 -0500
@@ -148,11 +148,13 @@
 		List<ISymbianSDK> sdkList = sdkMgr.getSDKList();
 
 		for (ISymbianSDK currSDK : sdkList) {
-			String epocRootStr = currSDK.getEPOCROOT();
-			try {
-				addDirToSDKDirectoryList(epocRootStr);
-			} catch (Exception e){
-				continue;
+			if (currSDK.isEnabled()) {
+				String epocRootStr = currSDK.getEPOCROOT();
+				try {
+					addDirToSDKDirectoryList(epocRootStr);
+				} catch (Exception e){
+					continue;
+				}
 			}
 		}