Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2019-006: import of UCFs was hanging

Browse Source
This commit is contained in:
Kathy Ruffing 2019-01-18 15:14:19 +00:00
parent 6593bb5877
commit 0cb7354084
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PROMS/VEPROMS User Interface/dlgExportImport.cs
View File

@ -303,7 +303,13 @@ namespace VEPROMS
bool result = TryToImportUCFs(ref isImported, ref canceledPressed); bool result = TryToImportUCFs(ref isImported, ref canceledPressed);
MyFrmVEPROMS.DisablePing = false;// Turn-on SessionPing MyFrmVEPROMS.DisablePing = false;// Turn-on SessionPing
TurnChangeManagerOn.Execute(); 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) if (isImported)
{ {
TimeSpan elapsed = DateTime.Now.Subtract(MyStart); TimeSpan elapsed = DateTime.Now.Subtract(MyStart);
@ -427,6 +433,7 @@ namespace VEPROMS
Format rec = Format.MakeFormat(pformat, name, description, null, null, dts, userid); Format rec = Format.MakeFormat(pformat, name, description, null, null, dts, userid);
rec.Config = config; rec.Config = config;
rec.Save(); rec.Save();
existingFormat.Add(name, rec.FormatID); // B2019-006: add imported format to existing so derived format can find parent
} }
} }
isImported = true; isImported = true;