From 63ccfa303119633b16968fc8dda43d446f5beff0 Mon Sep 17 00:00:00 2001
From: micio <micio@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 19 Feb 2014 12:18:31 +0000
Subject: [PATCH] Ide/Debuggers/Gdb_MI2 : fixed small bug in expression
 simplifier

git-svn-id: svn://ultimatepp.org/upp/trunk@6932 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Debuggers/Gdb_MI2Eval.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/uppsrc/ide/Debuggers/Gdb_MI2Eval.cpp b/uppsrc/ide/Debuggers/Gdb_MI2Eval.cpp
index acc6ff8dc..f5e4ea7ad 100644
--- a/uppsrc/ide/Debuggers/Gdb_MI2Eval.cpp
+++ b/uppsrc/ide/Debuggers/Gdb_MI2Eval.cpp
@@ -64,21 +64,22 @@ bool Gdb_MI2::TypeSimplify(MIValue &val, bool deep)
 					continue;
 				if(key.StartsWith("<"))
 				{
-					TYPE_SIMPLIFIER_HANDLER handler = GetSimplifier(v.GetKey(0));
+					TYPE_SIMPLIFIER_HANDLER handler = GetSimplifier(key);
 					if(handler)
 					{
-						needMore |= handler(*this, vRoot, deep);
+						bool nm = handler(*this, vRoot, deep);
 						if(deep)
 						{
-							if(needMore)
+							if(nm)
 							{
 								// we shall remove the temporary value now...
 								vRoot.Remove(SIMPLIFY_TEMPVAL);
-								return needMore;
+								return nm;
 							}
 						}
-						else if(needMore)
+						else if(nm)
 							vRoot.FindAdd(SIMPLIFY_TEMPVAL, "<evaluating...>");
+						needMore |= nm;
 					}
 					else
 						needMore |= TypeSimplify(v, deep);