Bug 94905: Error examining structure contents in debugger. The structure's elements should inherit the enablement flag from parents.

2 files changed, 6 insertions, 1 deletions

diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index ab74a626ae0..2342e98bcca 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-12 Mikhail Khodjaiants

+	Bug 94905: Error examining structure contents in debugger.

+	The structure's elements should inherit the enablement flag from parents.

+	* CVariable.java

+

 2005-03-17 Mikhail Khodjaiants

 	If casting of variable to a type or array causes an error, the status 

 	of the variable is set to "error" and it can't be reset by subsequent castings.

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
index 1cf0147141d..ef42260d32a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
@@ -344,7 +344,7 @@ public class CVariable extends AbstractCVariable implements ICDIEventListener {
 			fName = cdiVariableObject.getName();
 			createOriginal( cdiVariableObject );
 		}
-		fIsEnabled = !isBookkeepingEnabled();
+		fIsEnabled = ( parent instanceof AbstractCValue ) ? ((AbstractCValue)parent).getParentVariable().isEnabled() : !isBookkeepingEnabled();
 		getCDISession().getEventManager().addEventListener( this );
 	}