Evaluate should use the frame specified by frameId

Author: Simon Priest

UnityDebug/UnityDebugSession.cs

@@ -800,20 +800,22 @@ public override void Threads(Response response, dynamic args)
         public override void Evaluate(Response response, dynamic args)
         {
             var expression = GetString(args, "expression");
+            var frameId = GetInt(args, "frameId", 0);
 
             if (expression == null)
             {
                 SendError(response, "expression missing");
                 return;
             }
 
-            if (Frame == null)
+            var frame = m_FrameHandles.Get(frameId, null);
+            if (frame == null)
             {
                 SendError(response, "no active stackframe");
                 return;
             }
 
-            if (!Frame.ValidateExpression(expression))
+            if (!frame.ValidateExpression(expression))
             {
                 SendError(response, "invalid expression");
                 return;
@@ -822,7 +824,7 @@ public override void Evaluate(Response response, dynamic args)
             var evaluationOptions = m_DebuggerSessionOptions.EvaluationOptions.Clone();
             evaluationOptions.EllipsizeStrings = false;
             evaluationOptions.AllowMethodEvaluation = true;
-            var val = Frame.GetExpressionValue(expression, evaluationOptions);
+            var val = frame.GetExpressionValue(expression, evaluationOptions);
             val.WaitHandle.WaitOne();
 
             var flags = val.Flags;