diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 82f08177..90ed2439 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -827,7 +827,11 @@ namespace Volian.Controls.Library private DisplayTabItem FindRemainingTab(Bar myBar) { // C2023-004: Proms reverts to first tab rather than active tab/save last selected tab is and use to reset to it - if (LastSelectedDisplayTabItem != null && !_RemovedDisplayTabItems.Contains(LastSelectedDisplayTabItem)) + // B2023-078 Added the check for LastSelectedDisplayTabItem is in myBar. This fixes a crash issue where user has as split screen + // each with procedure tabs and closes a procedure tab in the split screen that does not currently have focus. + // that other screen has its own myBar list which does not contain the LastSelectedDisplayTabItem references. + // In that case we want to run through the foreach loop to find a tab in the currently active split screen side + if (LastSelectedDisplayTabItem != null && myBar.Items.Contains(LastSelectedDisplayTabItem) && !_RemovedDisplayTabItems.Contains(LastSelectedDisplayTabItem)) return LastSelectedDisplayTabItem; foreach (DisplayTabItem itm in myBar.Items) {