Merge remote-tracking branch 'remotes/origin/WpfDesignerStabilityBugFixes'

gumme · gumme · commit daf7734865ba · 2014-03-28T15:37:50.000+01:00
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/DragTreeViewItem.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/DragTreeViewItem.cs
@@ -159,7 +159,10 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
 		protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
 		{
 			base.OnMouseLeftButtonUp(e);
-			ParentTree.ItemMouseUp(this);
+			
+			if (ParentTree != null) {
+				ParentTree.ItemMouseUp(this);
+			}
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,10 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)`
`159`	`159`	`protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)`
`160`	`160`	`{`
`161`	`161`	`base.OnMouseLeftButtonUp(e);`
`162`		`- ParentTree.ItemMouseUp(this);`
	`162`	`+`
	`163`	`+ if (ParentTree != null) {`
	`164`	`+ ParentTree.ItemMouseUp(this);`
	`165`	`+ }`
`163`	`166`	`}`
`164`	`167`	`}`
`165`	`168`	`}`