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
This commit is contained in:
parent
da55996088
commit
def68c1ac8
@ -327,7 +327,8 @@ namespace VEPROMS
|
|||||||
dlgExportImport dlg = new dlgExportImport("Import", dvi);
|
dlgExportImport dlg = new dlgExportImport("Import", dvi);
|
||||||
dlg.ShowDialog(this);
|
dlg.ShowDialog(this);
|
||||||
MySessionInfo.CheckInItem(ownerid);
|
MySessionInfo.CheckInItem(ownerid);
|
||||||
tv.AddNewNode(dlg.MyNewProcedure);
|
if(dlg.MyNewProcedure != null)
|
||||||
|
tv.AddNewNode(dlg.MyNewProcedure);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (pi != null)
|
if (pi != null)
|
||||||
@ -1015,11 +1016,11 @@ namespace VEPROMS
|
|||||||
- Rich- WINDOWS7-RHM
|
- Rich- WINDOWS7-RHM
|
||||||
- Paul- Paul-PC
|
- Paul- Paul-PC
|
||||||
- Michelle- Michelle-PC
|
- Michelle- Michelle-PC
|
||||||
- Harry’s Mac- WIN-O4QLPEH7JKH
|
- Harry’s Mac- WIN-04QLPEH7JKH
|
||||||
- Harry’s PC- Harry-7100
|
- Harry’s PC- Harry-7100
|
||||||
- Caitlin- Caitlin-PC
|
- 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);
|
Random rnd = new Random(DateTime.Now.Year + DateTime.Now.DayOfYear * 1000);
|
||||||
MessageBox.Show(this, GetSecurityKey(), "Today's Security Key");
|
MessageBox.Show(this, GetSecurityKey(), "Today's Security Key");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user