From cbcbc74c3008aceac095b97db9f84fef4541e930 Mon Sep 17 00:00:00 2001
From: Ken Ryall <ken.ryall@nokia.com>
Date: Fri, 23 Jan 2009 02:40:22 +0000
Subject: [PATCH] Bug 236857

---
 .../ui/actions/EnableVariablesActionDelegate.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java
index 1e3f167035c..a8deb952d5c 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/EnableVariablesActionDelegate.java
@@ -85,7 +85,7 @@ public class EnableVariablesActionDelegate implements IViewActionDelegate {
 			public void run() {
 				while( it.hasNext() ) {
 					IEnableDisableTarget target = getEnableDisableTarget( it.next() );
-					if ( target != null ) {
+					if ( target != null && target.canEnableDisable() ) {
 						try {
 							if ( size > 1 ) {
 								target.setEnabled( isEnableAction() );
@@ -124,12 +124,12 @@ public class EnableVariablesActionDelegate implements IViewActionDelegate {
 		boolean allDisabled = true;
 		while( it.hasNext() ) {
 			IEnableDisableTarget target = getEnableDisableTarget( it.next() );
-			if ( target != null && !target.canEnableDisable() )
-				continue;
-			if ( target.isEnabled() )
-				allDisabled = false;
-			else
-				allEnabled = false;
+			if ( target != null && target.canEnableDisable() ) {
+				if ( target.isEnabled() )
+					allDisabled = false;
+				else
+					allEnabled = false;
+			}
 		}
 		if ( isEnableAction() )
 			action.setEnabled( !allEnabled );