PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -1209,15 +1209,11 @@ namespace VEPROMS
 			// See if there is an existing format file that was created as a copy.  If so, check if the passed in format's
 			// config is the same as an existing 'Copy of' format - if so, use rather than importing the same format as
 			// defined by config.
-			foreach (var existname in existingFormat.Where(existname => existname.Key.Contains(name)))
-			{
-					string cpy = existname.Key;
-					if (cpy.StartsWith("Copy") && cpy.Contains("of " + name))
+			foreach (string cpy in existingFormat.Select(existname => existname.Key).Where(existname => existname.Contains(name) && existname.StartsWith("Copy") && existname.Contains("of " + name)))
 			{
 				FormatInfo exFI = FormatInfo.Get(existingFormat[cpy]);
 				if (exFI.Config == config) return cpy;
 			}
-			}
 			return null;
 		}
 
@@ -3110,7 +3106,7 @@ namespace VEPROMS
 								bool hasNewROID = (content.MyGrid.Data.Contains(glookFor));
 								if (hasNewROID)
 									content.MyGrid.Data = content.MyGrid.Data.Replace(glookFor, greplaceWith);
-								else if (!hasNewROID && glookFor.Contains("0041") && glookFor.Contains("FFFF"))
+								else if (glookFor.Contains("0041") && glookFor.Contains("FFFF"))
 								{
 									string newGlookFor = glookFor;
 									newGlookFor = newGlookFor.Replace("0041", "0000");

PROMS/VEPROMS User Interface/dlgExportImportEP.cs

@@ -313,6 +313,7 @@ namespace VEPROMS
 			return xroid;
 		}
 
+		//overridden - used to set the RO location for RO Images that are not in annotations
 		protected override void SetROLocation(ref XmlElement xindivid, ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
 		{
 			string imgfile = GetROImageFileLocation(roc, rodb, isMulti);