Compare commits

..

No commits in common. "ff403583d7c169e8e1174bbf5eb269e35fde878c" and "c5577cc2bd7879d950d3deef877a89bf2bb7d34d" have entirely different histories.

2 changed files with 2 additions and 6 deletions

View File

@ -827,11 +827,7 @@ namespace Volian.Controls.Library
private DisplayTabItem FindRemainingTab(Bar myBar) 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 // C2023-004: Proms reverts to first tab rather than active tab/save last selected tab is and use to reset to it
// B2023-078 Added the check for LastSelectedDisplayTabItem is in myBar. This fixes a crash issue where user has as split screen if (LastSelectedDisplayTabItem != null && !_RemovedDisplayTabItems.Contains(LastSelectedDisplayTabItem))
// 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; return LastSelectedDisplayTabItem;
foreach (DisplayTabItem itm in myBar.Items) foreach (DisplayTabItem itm in myBar.Items)
{ {

View File

@ -7098,7 +7098,7 @@ namespace Volian.Print.Library
//if (paraLoc.MyParagraph.MyItemInfo.MyPrevious == null) // First substep //if (paraLoc.MyParagraph.MyItemInfo.MyPrevious == null) // First substep
level = 0; level = 0;
else else
level = 1; // AlarmPagination?3:1; // B2023-091: backout B2023-088 make it easier to break on a sequential for alarms level = AlarmPagination?3:1; // B2023-088 make it easier to break on a sequential for alarms
} }
else if (AlarmPagination && paraLoc.MyParagraph.MyItemInfo.IsSubStep) else if (AlarmPagination && paraLoc.MyParagraph.MyItemInfo.IsSubStep)
{ {