diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs index 20d5e45f..411afe84 100644 --- a/PROMS/VEPROMS User Interface/dlgExportImport.cs +++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs @@ -303,7 +303,13 @@ namespace VEPROMS bool result = TryToImportUCFs(ref isImported, ref canceledPressed); MyFrmVEPROMS.DisablePing = false;// Turn-on SessionPing TurnChangeManagerOn.Execute(); - if (!result) return; + if (!result) // B2019-006: let user know there was an error during import: + { + MessageBox.Show("Error occurred during import. Format(s) not imported."); + this.Cursor = Cursors.Default; + btnCloseImport.Enabled = true; + return; + } if (isImported) { TimeSpan elapsed = DateTime.Now.Subtract(MyStart); @@ -427,6 +433,7 @@ namespace VEPROMS Format rec = Format.MakeFormat(pformat, name, description, null, null, dts, userid); rec.Config = config; rec.Save(); + existingFormat.Add(name, rec.FormatID); // B2019-006: add imported format to existing so derived format can find parent } } isImported = true;