Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Stedfast <jestedfa@microsoft.com>2019-11-15 16:53:24 +0300
committermonojenkins <jo.shields+jenkins@xamarin.com>2019-11-15 17:17:20 +0300
commit5bf19647c21c6a231034fb952c5571270c1f0b4e (patch)
treebf36454b507a4e1511945c0a7536d04c3fb9e615 /main/src/addins
parentf5545da3fd325f2ba7198172cd7a501e11e44e94 (diff)
[Debugger] Fixed an NRE exception in OVTVController.RemoveValue if node.Parent is null
Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1022024
Diffstat (limited to 'main/src/addins')
-rw-r--r--main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/ObjectValueTreeViewController.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/ObjectValueTreeViewController.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/ObjectValueTreeViewController.cs
index 30801ce85c..13ebca43b2 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/ObjectValueTreeViewController.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/ObjectValueTreeViewController.cs
@@ -299,12 +299,18 @@ namespace MonoDevelop.Debugger
void RemoveValue (ObjectValueNode node)
{
var toplevel = node.Parent is RootObjectValueNode;
- int index = node.Parent.Children.IndexOf (node);
+ int index;
+
+ if (node.Parent != null) {
+ index = node.Parent.Children.IndexOf (node);
+ } else {
+ index = -1;
+ }
UnregisterNode (node);
OnEvaluationCompleted (node, new ObjectValueNode[0]);
- if (AllowWatchExpressions && toplevel)
+ if (AllowWatchExpressions && toplevel && index != -1)
ExpressionRemoved?.Invoke (this, new ExpressionRemovedEventArgs (index, node.Name));
}