B2023-072: Crash when restoring annotation whose type had been removed

F2023-074 – added the CaseInsens flag to the “go to” and “return to” replace words
B2023-073 – added format setting to override the calculation used to determine the width of tabs (including section tabs)
2023-06-13 12:59:43 +00:00 · 2023-06-12 19:41:40 +00:00 · 2023-06-12 19:41:03 +00:00 · 2023-06-08 18:34:48 +00:00 · 2023-06-08 18:22:22 +00:00
8 changed files with 579 additions and 432 deletions
@@ -1704,8 +1704,9 @@ namespace VEPROMS.CSLA.Library
 			try
 			{
 				AnnotationInfo tmp = DataPortal.Fetch<AnnotationInfo>(new RestoreCriteria(aai));
+				// B2023 - 073: Crash when restoring annotation whose type had been removed (if no record return null)
+				if (tmp.ErrorMessage == "No Record Found") return null;
 				AddToCache(tmp);
-				if (tmp.ErrorMessage == "No Record Found") tmp = null;
 				tmp.MyItem.RefreshItemAnnotations();
 				return tmp;
 			}
@@ -827,6 +827,16 @@ namespace Volian.Controls.Library
 				if (FlexibleMessageBox.Show(this, "Do you want to restore this annotation?", "Confirm Annotation Restore", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
 				{
 					AnnotationInfo ai = AnnotationInfo.RestoreAnnotation(aai);
+					// B2023-072: Don't crash if annotation type was deleted for the restore annotation
+					if (ai == null)
+					{
+						AnnotationTypeInfo ati = AnnotationTypeInfo.Get(aai.TypeID);
+						if (ati == null)
+						{
+							FlexibleMessageBox.Show(this, "Annotation Type was deleted, cannot restore Annotation Type\r\nCopy text from window in Change Details and paste into new annotation to restore the text.", "Annotation Type Deleted", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+						}
+						return;
+					}
 					OnAnnotationRestored(ai, ai.MyItem);
 					RefreshRequired = true;
 					UpdateHistory();
Author	SHA1	Message	Date
Kathy	be72063a3c	B2023-072: Crash when restoring annotation whose type had been removed	2023-06-13 12:59:43 +00:00
jjenko	fe270e55c7	F2023-074 – added the CaseInsens flag to the “go to” and “return to” replace words	2023-06-12 19:41:40 +00:00
jjenko	dce82f86cd	B2023-073 – added format setting to override the calculation used to determine the width of tabs (including section tabs) F2023-074 – added the CaseInsens flag to the “go to” and “return to” replace words	2023-06-12 19:41:03 +00:00
jjenko	1667d831ad	fixed compile error because Source Safe doesn't know how to merge properly NOR does is give you the option to just use the file you're checking in, instead of trying it merge just the changed lines.	2023-06-08 18:34:48 +00:00
jjenko	34679bc07c		2023-06-08 18:22:22 +00:00