From 8617ce456230f93dfb8c43c21b6cb9cc25631730 Mon Sep 17 00:00:00 2001
From: mschill <mschill@volian.com>
Date: Wed, 11 Sep 2024 15:34:22 -0400
Subject: [PATCH] 
 B2024-068_069_check_if_current_annotation_is_not_selected_before_removal_of_annotation

---
 .../AnnotationDetails.cs                      | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs
index dca9ff95..fbd56849 100644
--- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs
+++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs
@@ -277,17 +277,27 @@ namespace Volian.Controls.Library
 
 		private void btnRemoveAnnotation_Click(object sender, EventArgs e)
 		{
-			//using (Annotation annotation = CurrentAnnotation.Get())
-			//{
-			//				annotation.Delete();
-			_AnnotationSearch.LoadingList = true;
-			Annotation.DeleteAnnotation(CurrentAnnotation);
-			//				annotation.Save();
-			_AnnotationSearch.LoadingList = false;
-			CurrentAnnotation = null;
-			UpdateAnnotationGrid();
-			_AnnotationSearch.UpdateAnnotationSearchResults(); // B2019-004: update search results list when an annotation is removed.
-			//}
+			// CSM B2024-068 / B2024-069 - check if current annotation is not selected before removal of annotation
+			if (CurrentAnnotation != null)
+			{
+				//using (Annotation annotation = CurrentAnnotation.Get())
+				//{
+				//				annotation.Delete();
+				_AnnotationSearch.LoadingList = true;
+				Annotation.DeleteAnnotation(CurrentAnnotation);
+				//				annotation.Save();
+				_AnnotationSearch.LoadingList = false;
+				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)