diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index e69a18d1..e0276453 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -505,7 +505,8 @@ namespace Volian.Controls.Library if (_MyDisplayTabItems.ContainsKey(key)) // If procedure page open use it { DisplayTabItem pg = _MyDisplayTabItems[key]; - if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID)) + if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID) && + pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID].Expanded) { EditItem edtitm = pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID]; switch (pasteType) diff --git a/PROMS/Volian.Controls.Library/frmSendErrorLog.cs b/PROMS/Volian.Controls.Library/frmSendErrorLog.cs index 1ab20a12..9f6b6778 100644 --- a/PROMS/Volian.Controls.Library/frmSendErrorLog.cs +++ b/PROMS/Volian.Controls.Library/frmSendErrorLog.cs @@ -119,7 +119,7 @@ namespace Volian.Controls.Library Match mServer = Regex.Match(connectionString, ".*Data Source=([^;]*).*"); string server = (mServer.Success) ? mServer.Groups[1].Value : "unknown"; if (server.StartsWith(@".\")) server = @"Local \ " + server.Substring(2); - string databaseName = Database.ActiveDatabase; + string databaseName = string.Format("{0}[SQL:{1:yyMM.ddHH}]", Database.ActiveDatabase, Database.RevDate); sb.Append(string.Format("SQL Server: {0}", server)); //if (databaseName == null) databaseName = Regex.Replace(connectionString, "^.*Initial Catalog=([^;]*);.*$", "$1", RegexOptions.IgnoreCase); sb.AppendLine(string.Format("\t\tDatabase: {0}", databaseName));