From def68c1ac82758f3b9b0edd5d430fbc4871d1d08 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 30 Jul 2014 02:39:32 +0000 Subject: [PATCH] Added code to prevent PROMS crash when closing Export/Import dialog for importing procedure without actually importing procedure Corrected domain name for Harry's Macintosh machine --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 8867b4e3..b5e42123 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -327,7 +327,8 @@ namespace VEPROMS dlgExportImport dlg = new dlgExportImport("Import", dvi); dlg.ShowDialog(this); MySessionInfo.CheckInItem(ownerid); - tv.AddNewNode(dlg.MyNewProcedure); + if(dlg.MyNewProcedure != null) + tv.AddNewNode(dlg.MyNewProcedure); } } if (pi != null) @@ -1015,11 +1016,11 @@ namespace VEPROMS - Rich- WINDOWS7-RHM - Paul- Paul-PC - Michelle- Michelle-PC -- Harry’s Mac- WIN-O4QLPEH7JKH +- Harry’s Mac- WIN-04QLPEH7JKH - Harry’s PC- Harry-7100 - Caitlin- Caitlin-PC */ - if ("|VOLIAN0|JCB2-HP|WINDOWS7-RHM|PAUL-PC|MICHELLE-PC|WIN-O4QLPEH7JKH|HARRY-7100|CAITLIN-PC|".Contains("|" + Environment.UserDomainName + "|")) + if ("|VOLIAN0|JCB2-HP|WINDOWS7-RHM|PAUL-PC|MICHELLE-PC|WIN-04QLPEH7JKH|HARRY-7100|CAITLIN-PC|".Contains("|" + Environment.UserDomainName + "|")) { Random rnd = new Random(DateTime.Now.Year + DateTime.Now.DayOfYear * 1000); MessageBox.Show(this, GetSecurityKey(), "Today's Security Key");