瀏覽代碼

Handle detached controls in layout pass.

Controls can still be queued for layout after they've been removed from
the visual tree.
Steven Kirk 10 年之前
父節點
當前提交
b72f08354a
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/Perspex.Layout/LayoutManager.cs

+ 2 - 2
src/Perspex.Layout/LayoutManager.cs

@@ -276,12 +276,12 @@ namespace Perspex.Layout
                         {
                             var control = item.Control;
 
-                            while (control.PreviousArrange == null)
+                            while (control != null && control.PreviousArrange == null)
                             {
                                 control = control.GetVisualParent<ILayoutable>();
                             }
 
-                            if (control.GetVisualRoot() == Root)
+                            if (control != null && control.GetVisualRoot() == Root)
                             {
                                 control.Arrange(control.PreviousArrange.Value, true);
                             }