From aace632c9b4b5eb4dd43a972ef98e7423b66dd42 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 3 Jul 2013 15:58:12 +0000 Subject: [PATCH] Added logic to protect against failures when an invalid transition text is removed. Added logic to protect against failures when an invalid transition text is selected. --- PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 3 +++ PROMS/Volian.Controls.Library/DisplayTransition.cs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 41667fe6..df1e887d 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -497,6 +497,9 @@ namespace VEPROMS.CSLA.Library } private static string BuildString(TransitionBuilder tb) { + //Invalid Transition Check + if (tb._ToItem.ActiveParent == null || tb._RangeItem.ActiveParent == null) + return "?"; int startIndex = 0; int index = -1; string prefix = null; diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index bec930e8..0d3e80de 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -195,6 +195,9 @@ namespace Volian.Controls.Library // figure out whether at same level, have same parent and have same HLS: ItemInfo itm1 = _CurTrans.MyItemToID; ItemInfo itm2 = _CurTrans.MyItemRangeID; + // Invalid existing transition + if (itm2.ActiveParent == null || itm1.ActiveParent == null) + return; //if (_CurTrans.TranType == 2 && itm1.ItemID == itm2.ItemID) itm2 = itm1.LastSibling; bool samHLS = itm1.MyHLS.ItemID == itm2.MyHLS.ItemID; int lev1 = 0;