From 3e53ec91914d77617b9cfe49acd2207a66841c62 Mon Sep 17 00:00:00 2001
From: mschill <mschill@volian.com>
Date: Tue, 13 May 2025 07:48:50 -0400
Subject: [PATCH] C2025-023 - Electronic Procedures - Modifications to PROMS
 Small change to handle removed items that were selected.

---
 PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs b/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs
index 8017d256..13077a6f 100644
--- a/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs
+++ b/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs
@@ -183,7 +183,7 @@ namespace Volian.Controls.Library
 			foreach (KeyValuePair<string, ComboBox> pair in _DicSingleRO)
 			{
 				string val = MyConfig.GetValue("EP", pair.Key);
-				if (val != null && val != "")
+				if (!string.IsNullOrEmpty(val) && pair.Value.Items.OfType<ROListItem>().Any(x=> x.Value == val))
 					pair.Value.SelectedValue = val;
 				else
 					pair.Value.SelectedValue = "";
@@ -199,8 +199,8 @@ namespace Volian.Controls.Library
 					var selectedvalues = val.Split(multiseparator.ToCharArray());
 					foreach (string item in selectedvalues)
                         {
-							string text = ((List<ROListItem>)pair.Value.DataSource).First(x => x.Value == item).Text;
-							pair.Value.SetSelected(pair.Value.FindString(text), true);
+							string text = ((List<ROListItem>)pair.Value.DataSource).Find(x => x.Value == item)?.Text;
+						    if (!string.IsNullOrEmpty(text)) pair.Value.SetSelected(pair.Value.FindString(text), true);
 						}
 				}