From 8733418b4e9f9eee2f1f8a33a04f9d8d89d89672 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 12 Aug 2020 14:24:46 +0000 Subject: [PATCH] Merge in fixes (8/4 & 8/5/2020) for: C2020-031: clarify dialog caption for export of approved procedure B2020-103: crash on null reference when cancel from create new section --- PROMS/Volian.Controls.Library/vlnTreeView.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index d4e51699..a141d63f 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1280,7 +1280,7 @@ namespace Volian.Controls.Library if (!di.Exists) di.Create(); string fileName = PEIPath + "\\" + str + "Approved_Rev_" + ri.RevisionNumber.Replace(" ", "_").Replace("\\", "-").Replace("/", "-") +"_" + xd.SelectSingleNode("procedure/content/@number").InnerText.Replace(" ", "_").Replace(@"\u8209?", "-").Replace(@"\u9586?", "_") + ".pxml"; xd.Save(fileName); - FlexibleMessageBox.Show("Approved procedure saved to import file " + fileName, "Saving TempMod", MessageBoxButtons.OK, MessageBoxIcon.Information); + FlexibleMessageBox.Show("Approved procedure saved to import file " + fileName, "Creating Export of Approved Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information); } void ApprovedRevision_Click(object sender, EventArgs e) @@ -2807,7 +2807,7 @@ namespace Volian.Controls.Library // B2020-087 the config for SubSection_Edit was sometimes set even when there wasn't any subsections, // so make sure it's cleared if there are no existing subsections SectionConfig sc = _LastItemInfo.MyConfig as SectionConfig; - if (sc.SubSection_Edit == "Y" && _LastItemInfo.Sections == null) + if (sc != null && sc.SubSection_Edit == "Y" && _LastItemInfo.Sections == null) { sc.SubSection_Edit = null; using (Section mysect = Section.Get(_LastItemInfo.ItemID)) @@ -3208,7 +3208,7 @@ namespace Volian.Controls.Library { // B2020-087 if we deleted the last sub section, then clear the SubSection_Edit in the parent's config SectionConfig sc = pii.MyConfig as SectionConfig; - if (sc.SubSection_Edit == "Y" && pii.Sections == null) + if (sc != null && sc.SubSection_Edit == "Y" && pii.Sections == null) // B2020-103: Added null check { sc.SubSection_Edit = null; using (Section mysect = Section.Get(pii.ItemID))