From c639d037eda4f63a8fe2e5be05b87081c128f981 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Mon, 27 Jan 2003 18:46:17 +0000 Subject: [PATCH] Did not compare the stack correctly. --- .../org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java index 5789221eb10..9e9f01df780 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java @@ -78,14 +78,15 @@ public class VariableManager extends SessionObject implements ICDIVariableManage Variable[] vars = getVariables(); for (int i = 0; i < vars.length; i++) { if (vars[i].getName().equals(name)) { - if (stack != null && vars[i].getStackFrame().equals(stack)) { + ICDIStackFrame frame = vars[i].getStackFrame(); + if (stack == null && frame == null) { + return vars[i]; + } else if (frame != null && stack != null && frame.equals(stack)) { if (vars[i].getVariableObject().getPosition() == position) { if (vars[i].getVariableObject().getStackDepth() == depth) { return vars[i]; } } - } else { - return vars[i]; } } }