From dbd9d062ea32bb7b0105f9590b836e4bda96a550 Mon Sep 17 00:00:00 2001
From: micio <micio@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 23 Mar 2014 12:21:03 +0000
Subject: [PATCH] Ide/Debuggers/Gdb_MI2 : fix display of frame args

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

diff --git a/uppsrc/ide/Debuggers/Gdb_MI2.cpp b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
index 3ea5e1883..3cab87e09 100644
--- a/uppsrc/ide/Debuggers/Gdb_MI2.cpp
+++ b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
@@ -871,9 +871,16 @@ String Gdb_MI2::FormatFrame(MIValue &fInfo, MIValue &fArgs)
 	String argLine;
 	for(int iArg = 0; iArg < nArgs; iArg++)
 	{
-		argLine += fArgs[iArg]["name"].Get();
-		if(fArgs[iArg].Find("value") >= 0)
-			argLine << "=" << fArgs[iArg]["value"];
+		MIValue &arg = fArgs[iArg];
+		if(arg.IsTuple())
+		{
+			argLine += arg["name"].Get();
+			if(arg.Find("value") >= 0)
+				argLine << "=" << arg["value"];
+		}
+		else if(arg.IsString())
+			// quick fix....
+			argLine << "=" << arg.ToString().Mid(1);
 		argLine << ',';
 	}
 	if(!argLine.IsEmpty())
@@ -907,7 +914,7 @@ bool Gdb_MI2::FillDropFrames(int min, int max, bool val)
 	{
 		MIValue &fInfo = frameList[iFrame];
 		MIValue &fArgs = frameArgs[iFrame]["args"];
-		frame.Add(iFrame, FormatFrame(fInfo, fArgs));
+		frame.Add(iFrame + min, FormatFrame(fInfo, fArgs));
 	}
 	return true;
 }