From 01a3907a2c513aff7ecdcacc08d61b059dfd51d1 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 26 Jul 2013 16:15:03 +0000 Subject: [PATCH] Added "Applicability" heading to Sync output Bug Fix - Added logic to check if there is a non-null SelectedEditItem, before using the property of the SelectedEditItem. DSO Framer Save - Close DSO Framer window when PROMS closes. --- PROMS/Sync/Sync/frmSync.cs | 3 +++ PROMS/VEPROMS User Interface/frmVEPROMS.cs | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PROMS/Sync/Sync/frmSync.cs b/PROMS/Sync/Sync/frmSync.cs index 58482c0f..59f0c0e7 100644 --- a/PROMS/Sync/Sync/frmSync.cs +++ b/PROMS/Sync/Sync/frmSync.cs @@ -466,6 +466,9 @@ namespace Sync Font fntBoldItalic = new Font("Arial", 14, FontStyle.Bold | FontStyle.Italic); StringBuilder sb = new StringBuilder(); dgv.EndEdit(); + sb.Append("Applicability:\r\n\r\n"); + AddText(rtb, fntBold, "Applicability:"); + AddText(rtb, fntNormal, "\r\n\r\n\r\n\r\n"); if (HasFmtXML(_CheckedOut)) { sb.Append("* This change includes format changes which must be loaded into the databases.\r\n\r\n"); diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 27b737c7..43a29834 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -573,6 +573,8 @@ namespace VEPROMS } void frmVEPROMS_FormClosed(object sender, System.Windows.Forms.FormClosedEventArgs e) { + // Close any open documents + tc.Dispose(); // RHM 20121010 // Something was causing the process to remain in memory for an extended period of time // after printing procedures. The following lines kills the process immediately. @@ -1369,7 +1371,8 @@ namespace VEPROMS displayRO.Mydvi = SelectedDVI; displayRO.MyROFST = SelectedROFst; - displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB; + displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : + SelectedStepTabPanel.MyStepPanel.SelectedEditItem == null ? null : SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB; displayRO.TabControl = tc; displayRO.ProgressBar = bottomProgBar;