From 588edabb251dbff26607e96a1eb294c9c5b67a05 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 18 May 2018 14:05:30 +0000 Subject: [PATCH] B2018-076 - Adding a substep to a second figure was causing the code to crrash --- PROMS/Volian.Controls.Library/EditItem.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index c8437007..c4e12a12 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -3645,8 +3645,12 @@ namespace Volian.Controls.Library ContentWidth = myParentEditItem.ContentWidth; if (itemInfo.IsStep && itemInfo.MyParent.IsFigure) { - ContentWidth = myParentEditItem.MyParentEditItem.ContentWidth; - Left = myParentEditItem.MyParentEditItem.Left + myParentEditItem.MyParentEditItem.TabLeft; // B2017-129 fixed null reference + // B2018-076 _ Handle Multiple Tables or Figure where Parent is null and Previous is not null + EditItem mypar = myParentEditItem; + while (mypar.MyParentEditItem == null && mypar.MyPreviousEditItem != null) + mypar = mypar.MyPreviousEditItem; + ContentWidth = mypar.MyParentEditItem.ContentWidth; + Left = mypar.MyParentEditItem.Left + mypar.MyParentEditItem.TabLeft; // B2017-129 fixed null reference } if (myChildRelation == ChildRelation.None)