From 77c7cb6d6bad8f27588e14432d984e63df79c843 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 20 Sep 2017 19:18:47 +0000 Subject: [PATCH] =?UTF-8?q?F2017-060=20Adjust=20the=20Roman=20Numeral=20HL?= =?UTF-8?q?S=20tab=20so=20that=20it=20aligns=20with=20the=20other=20high?= =?UTF-8?q?=20level=20step=20types=20F2017-061=20hide=20the=20Asterisk=20h?= =?UTF-8?q?igh=20level=20step=20type=20B2017-214=20=E2=80=93=20add=20a=20n?= =?UTF-8?q?ull=20reference=20check=20for=20when=20you=20close=20PROMS=20bu?= =?UTF-8?q?t=20do=20not=20have=20any=20procedures=20open?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BGESAM1all.xml | Bin 98890 -> 98984 bytes PROMS/Formats/fmtall/BGESTPall.xml | Bin 151182 -> 151182 bytes PROMS/VEPROMS User Interface/frmVEPROMS.cs | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/BGESAM1all.xml b/PROMS/Formats/fmtall/BGESAM1all.xml index 31cd90460250b65b44cd26c6310f5c54d1b089d0..ea5e75869f78f240c420828a3782e6cd790489aa 100644 GIT binary patch delta 78 zcmX@r!nUH7ZG)35qr&8eKE*)N(e);f+~_7e*~Cp~vVjZB diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml index f3b4d4b10cc812940e5a45087c02e97932df9a49..fd63dcaed46ad42d9670c6b10558a3808d317509 100644 GIT binary patch delta 31 ncmeC1%h@-VvtbLPlIrvofs9(y1yUIU+UKY;Zl9yd^hpB%vJ(p0 delta 33 pcmeC1%h@-VvtbLPk}9L)bXyn3)aeD9j3VuGR2jF=QDyq10RXwZ3daBd diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 0895f3d3..c2699294 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1074,7 +1074,8 @@ namespace VEPROMS { // B2017-212 If the user uses the X button in Word to close the word attachment, PROMS thinks that the user wants to close out of PROMS as well // trap for this and close only the Word tab in PROMS - if (tc.SelectedDisplayTabItem.MyDSOTabPanel != null) + // B2017-214 added a null reference check + if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyDSOTabPanel != null) { string stk = Volian.Base.Library.vlnStackTrace.StackToString(); if (!stk.Contains("MouseUp") && !stk.Contains("ButtonDown") && !stk.Contains("Exception"))