diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index 1005f838..57a9acdd 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -871,6 +871,11 @@ namespace Volian.Controls.Library #endregion #region AddRtfTextAndStyles private string _LastRtf = ""; + public string LastRtf + { + get { return _LastRtf; } + set { _LastRtf = value; } + } private bool _lastReadOnly = false; private void AddRtfText(string txt) { @@ -1268,6 +1273,10 @@ namespace Volian.Controls.Library // 'dotnetbar' when text was NOT Changed. So _IsDirty was made into // a property and compared original rtf versus current richtextbox's // rtf. + // the below 2 lines were added to solve the problem with the change manager detail not showing the text of an audit when the same audit + //was selected twice + if (Text == string.Empty) + LastRtf = string.Empty; FindAllLinks(); } public void StepRTB_ContentsResized(object sender, ContentsResizedEventArgs e) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 372daffd..00128a1e 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -515,9 +515,9 @@ namespace Volian.Controls.Library } private void SetButtonAndMenuEnabling(bool docontextmenus) { + if (_MyStepRTB == null) return; if (_MyStepRTB.FieldToEdit != E_FieldToEdit.StepText) return; // No need to change menu that does not get used - if (_MyStepRTB == null) return; DocVersionInfo dvi = MyEditItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo; if (dvi == null) return; if (dvi.VersionType > 127 || MyEditItem.MyStepPanel.VwMode == E_ViewMode.View)