B2017-084: Fix hang when closing PROMS with Word doc open & open/close of RO Editor

B2017-084: Fix hang when closing PROMS with Word doc open & open/close of RO Editor.
This commit is contained in:
2017-05-18 14:13:23 +00:00
parent ab44a78d9e
commit 5ea29fbc74
3 changed files with 18 additions and 1 deletions

View File

@@ -943,6 +943,7 @@ namespace VEPROMS
// if ro.fst was 'updated' from the roeditor, enable the update ro.fst values on
// the steptabribbon.
if (tc.ShuttingDown) return;
if (SelectedStepTabPanel!=null && SelectedStepTabPanel.MyStepTabRibbon != null)
SelectedStepTabPanel.MyStepTabRibbon.SetUpdRoValBtn(SelectedStepTabPanel.MyStepTabRibbon.NewerRoFst());
}
@@ -1050,7 +1051,13 @@ namespace VEPROMS
}
private void frmVEPROMS_FormClosing(object sender, FormClosingEventArgs e)
{
//tc.ShuttingDown = true;// This keeps PROMS from Hanging under certain circumstances
tc.ShuttingDown = true; // This keeps PROMS from Hanging under certain circumstances
foreach (DisplayTabItem dti in tc.MyBar.Items)
{
if (dti.MyDSOTabPanel != null)
dti.MyDSOTabPanel.CloseDSO();
}
_MyLog.WarnFormat("frmVEPROMS_FormClosing");
if (MyParent == null)
{
if (MyActivityTimer != null) MyActivityTimer.Dispose();
@@ -2163,6 +2170,7 @@ namespace VEPROMS
}
void tc_Leave(object sender, EventArgs e)
{
if (tc.ShuttingDown) return;
tc.ShowCaret();// Show the pseudo cursor (caret)
}
void tc_Enter(object sender, EventArgs e)