This commit is contained in:
Kathy Ruffing 2008-08-12 11:48:04 +00:00
parent 5bedb853c5
commit 992d727d3c
3 changed files with 4 additions and 1 deletions

View File

@ -217,7 +217,7 @@ namespace Volian.Controls.Library
private void UpdateAnnotationGrid() private void UpdateAnnotationGrid()
{ {
_LoadingGrid = true; _LoadingGrid = true;
_Annotations = _CurrentItem.ItemAnnotations; _Annotations = (_CurrentItem == null) ? null : _CurrentItem.ItemAnnotations;
itemAnnotationsBindingSource.DataSource = _Annotations; itemAnnotationsBindingSource.DataSource = _Annotations;
if ((CurrentAnnotation == null || (_CurrentItem.ItemID != CurrentAnnotation.ItemID))) if ((CurrentAnnotation == null || (_CurrentItem.ItemID != CurrentAnnotation.ItemID)))
{ {

View File

@ -294,6 +294,7 @@ namespace Volian.Controls.Library
bool result = true; bool result = true;
try try
{ {
SaveDirty();
_MyDSOFramer.Close(); _MyDSOFramer.Close();
Controls.Remove(_MyDSOFramer); Controls.Remove(_MyDSOFramer);
components.Remove(_MyDSOFramer); components.Remove(_MyDSOFramer);

View File

@ -118,6 +118,8 @@ namespace Volian.Controls.Library
} }
private string GetToolTip() private string GetToolTip()
{ {
// reset active parent if null
// if (MyItemInfo.MyProcedure.ActiveParent == null) MyItemInfo.MyProcedure.ActiveParent = null;
DocVersionInfo tmp = (DocVersionInfo)(MyItemInfo.MyProcedure.ActiveParent); DocVersionInfo tmp = (DocVersionInfo)(MyItemInfo.MyProcedure.ActiveParent);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
int indent = BuildPath(tmp.MyFolder, ref sb); int indent = BuildPath(tmp.MyFolder, ref sb);