From 462a93f53d79ef76bd836e34463bee3db5b46d10 Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 10 Apr 2013 15:14:50 +0000 Subject: [PATCH] Fixed logic so that Recently Used List is not cleared when the connection string uses a specific database rather than {MENU}. --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 70014587..e1f132b4 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -211,7 +211,7 @@ namespace VEPROMS throw new Exception("Inconsistent Formats"); if (!ItemAuditInfo.IsChangeManagerVersion()) throw new Exception("Inconsistent Data"); - if (Database.LastDatabase != Database.SelectedDatabase) + if ((Database.LastDatabase ?? "") != (Database.SelectedDatabase ?? "")) { Properties.Settings.Default.MRIList = null; Properties.Settings.Default.DefaultDB = Database.SelectedDatabase; @@ -344,11 +344,11 @@ namespace VEPROMS string fileName = Volian.Base.Library.VlnSettings.TemporaryFolder + "\\" + args.MyFilename; try { - FileStream fs = new FileStream(fileName, FileMode.Create); - fs.Write(buffer, 0, buffer.Length); - fs.Close(); - System.Diagnostics.Process.Start(fileName); - } + FileStream fs = new FileStream(fileName, FileMode.Create); + fs.Write(buffer, 0, buffer.Length); + fs.Close(); + System.Diagnostics.Process.Start(fileName); + } catch (Exception ex) { StringBuilder sb = new StringBuilder(); @@ -965,7 +965,6 @@ namespace VEPROMS private void tv_BeforeExpand(object sender, TreeViewCancelEventArgs e) { _ExpandingTree = true; - Volian.Base.Library.vlnStackTrace.ShowStackLocal("tv_BeforeExpand", 3); VETreeNode tn = ((VETreeNode)e.Node); tn.LoadingChildrenDone += new VETreeNodeEvent(tn_LoadingChildrenDone); tn.LoadingChildrenMax += new VETreeNodeEvent(tn_LoadingChildrenMax);