Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge pull request 'Development' (#111) from Development into master

Browse Source 
Merging B2023-091 and B2023-078 from development into master.
This commit is contained in:
Devin Jankowski 2023-08-30 16:07:17 -04:00
commit ff403583d7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PROMS/Volian.Controls.Library/DisplayTabControl.cs
View File

@ -827,7 +827,11 @@ 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
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; return LastSelectedDisplayTabItem;
foreach (DisplayTabItem itm in myBar.Items) foreach (DisplayTabItem itm in myBar.Items)
{ {

2
PROMS/Volian.Print.Library/vlnParagraph.cs
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 = AlarmPagination?3:1; // B2023-088 make it easier to break on a sequential for alarms level = 1; // AlarmPagination?3:1; // B2023-091: backout 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)
{ {