From 992d727d3c9b3f26cfa140f87f057c51edfa60c8 Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 12 Aug 2008 11:48:04 +0000 Subject: [PATCH] --- PROMS/Volian.Controls.Library/AnnotationDetails.cs | 2 +- PROMS/Volian.Controls.Library/DSOTabPanel.cs | 1 + PROMS/Volian.Controls.Library/MostRecentItem.cs | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs index 4fe377ce..80821026 100644 --- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs +++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs @@ -217,7 +217,7 @@ namespace Volian.Controls.Library private void UpdateAnnotationGrid() { _LoadingGrid = true; - _Annotations = _CurrentItem.ItemAnnotations; + _Annotations = (_CurrentItem == null) ? null : _CurrentItem.ItemAnnotations; itemAnnotationsBindingSource.DataSource = _Annotations; if ((CurrentAnnotation == null || (_CurrentItem.ItemID != CurrentAnnotation.ItemID))) { diff --git a/PROMS/Volian.Controls.Library/DSOTabPanel.cs b/PROMS/Volian.Controls.Library/DSOTabPanel.cs index 2284a853..ac633795 100644 --- a/PROMS/Volian.Controls.Library/DSOTabPanel.cs +++ b/PROMS/Volian.Controls.Library/DSOTabPanel.cs @@ -294,6 +294,7 @@ namespace Volian.Controls.Library bool result = true; try { + SaveDirty(); _MyDSOFramer.Close(); Controls.Remove(_MyDSOFramer); components.Remove(_MyDSOFramer); diff --git a/PROMS/Volian.Controls.Library/MostRecentItem.cs b/PROMS/Volian.Controls.Library/MostRecentItem.cs index 85108a79..f2e4de05 100644 --- a/PROMS/Volian.Controls.Library/MostRecentItem.cs +++ b/PROMS/Volian.Controls.Library/MostRecentItem.cs @@ -118,6 +118,8 @@ namespace Volian.Controls.Library } private string GetToolTip() { + // reset active parent if null + // if (MyItemInfo.MyProcedure.ActiveParent == null) MyItemInfo.MyProcedure.ActiveParent = null; DocVersionInfo tmp = (DocVersionInfo)(MyItemInfo.MyProcedure.ActiveParent); StringBuilder sb = new StringBuilder(); int indent = BuildPath(tmp.MyFolder, ref sb);