Compare commits

..

No commits in common. "2e00693a3303f19675cb5591231e99458275fe46" and "78416ef4525c083b75d71ce697a322b5be7a3148" have entirely different histories.

View File

@ -277,27 +277,17 @@ namespace Volian.Controls.Library
private void btnRemoveAnnotation_Click(object sender, EventArgs e) private void btnRemoveAnnotation_Click(object sender, EventArgs e)
{ {
// CSM B2024-068 / B2024-069 - check if current annotation is not selected before removal of annotation //using (Annotation annotation = CurrentAnnotation.Get())
if (CurrentAnnotation != null) //{
{ // annotation.Delete();
//using (Annotation annotation = CurrentAnnotation.Get()) _AnnotationSearch.LoadingList = true;
//{ Annotation.DeleteAnnotation(CurrentAnnotation);
// annotation.Delete(); // annotation.Save();
_AnnotationSearch.LoadingList = true; _AnnotationSearch.LoadingList = false;
Annotation.DeleteAnnotation(CurrentAnnotation); CurrentAnnotation = null;
// annotation.Save(); UpdateAnnotationGrid();
_AnnotationSearch.LoadingList = false; _AnnotationSearch.UpdateAnnotationSearchResults(); // B2019-004: update search results list when an annotation is removed.
CurrentAnnotation = null; //}
UpdateAnnotationGrid();
_AnnotationSearch.UpdateAnnotationSearchResults(); // B2019-004: update search results list when an annotation is removed.
//}
}
else
{
FlexibleMessageBox.Show("You Must Select an Annotation To Remove", "Annotation Not Selected", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
} }
private void btnSaveAnnotation_Click(object sender, EventArgs e) private void btnSaveAnnotation_Click(object sender, EventArgs e)