--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java	Fri Feb 19 09:31:35 2010 -0600
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java	Fri Feb 19 12:24:25 2010 -0600
@@ -25,8 +25,6 @@
 import org.osgi.framework.Version;
 
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
-import com.nokia.carbide.cpp.internal.sdk.core.model.SDKManager;
-import com.nokia.carbide.cpp.sdk.core.ISDKManager;
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
 
 public class BuilderUtilsPropertyTester extends PropertyTester {

--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java	Fri Feb 19 09:31:35 2010 -0600
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java	Fri Feb 19 12:24:25 2010 -0600
@@ -27,7 +27,6 @@
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -46,6 +45,7 @@
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.handlers.HandlerUtil;
 
@@ -133,15 +133,19 @@
 			IWorkbenchWindow window = Activator.getActiveWorkbenchWindow();
 			IWorkbenchPage wpage = window.getActivePage();
 			if (wpage != null) {
-				IEditorPart ep = wpage.getActiveEditor();
-				if (ep != null) {
-					IEditorInput editorInput = ep.getEditorInput();
-					if (editorInput instanceof IFileEditorInput) {
-						IFile file = ((IFileEditorInput)editorInput).getFile();
-						if (file != null) {
-							IProject project = file.getProject();
-							if (CarbideBuilderPlugin.getBuildManager().isCarbideProject(project)) {
-								selectedProjects.add(project);
+				// make sure it's not the disassembly (or DSF disassembly) view
+				IWorkbenchPart part = wpage.getActivePart();
+				if (part == null || !part.getTitle().toLowerCase().endsWith("disassembly")) { //$NON-NLS-1$
+					IEditorPart ep = wpage.getActiveEditor();
+					if (ep != null) {
+						IEditorInput editorInput = ep.getEditorInput();
+						if (editorInput instanceof IFileEditorInput) {
+							IFile file = ((IFileEditorInput)editorInput).getFile();
+							if (file != null) {
+								IProject project = file.getProject();
+								if (CarbideBuilderPlugin.getBuildManager().isCarbideProject(project)) {
+									selectedProjects.add(project);
+								}
 							}
 						}
 					}