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

Added StepRTB Closed logic to disposing

Browse Source
This commit is contained in:
Rich 2011-08-23 18:41:06 +00:00
parent 15d7ab597c
commit fab3c49244
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -1076,7 +1076,7 @@ namespace VEPROMS
private StepRTB _LastStepRTB = null; private StepRTB _LastStepRTB = null;
private void tc_ItemSelectedChanged(object sender, ItemSelectedChangedEventArgs args) private void tc_ItemSelectedChanged(object sender, ItemSelectedChangedEventArgs args)
{ {
if (_LastStepRTB != null && !_LastStepRTB.Disposing) if (_LastStepRTB != null && !_LastStepRTB.Disposing && !_LastStepRTB.Closed)
_LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged); _LastStepRTB.EditModeChanged -= new StepRTBEvent(_LastStepRTB_EditModeChanged);
_LastStepRTB = args != null && args.MyEditItem != null ? args.MyEditItem.MyStepRTB : null; _LastStepRTB = args != null && args.MyEditItem != null ? args.MyEditItem.MyStepRTB : null;
if (_LastStepRTB != null) _LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged); if (_LastStepRTB != null) _LastStepRTB.EditModeChanged += new StepRTBEvent(_LastStepRTB_EditModeChanged);

3
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -364,7 +364,7 @@ namespace VEPROMS.CSLA.Library
{ {
Match m1 = regexDBSeqPass1.Match(ShortPath); Match m1 = regexDBSeqPass1.Match(ShortPath);
MatchCollection m2s = regexDBSeqPass2.Matches(m1.Groups[4].Value); MatchCollection m2s = regexDBSeqPass2.Matches(m1.Groups[4].Value);
StringBuilder retval = new StringBuilder(string.Format("'{0}','{1}',{2},'", m1.Groups[1].Value, m1.Groups[2].Value, m1.Groups[3].Value)); StringBuilder retval = new StringBuilder(string.Format("\"{0}\"\t\"{1}\"\t\"{2}\"", m1.Groups[1].Value, m1.Groups[2].Value, m1.Groups[3].Value));
string prefix = "S"; string prefix = "S";
string suffix = ""; string suffix = "";
foreach (Match m2 in m2s) foreach (Match m2 in m2s)
@ -397,6 +397,7 @@ namespace VEPROMS.CSLA.Library
prefix = ""; prefix = "";
} }
retval.Append(prefix + "'"); retval.Append(prefix + "'");
//Volian.Base.Library.DebugText.WriteLine("'{0}','{1}','{2}'", retval, ShortPath, Path);
return retval.ToString(); return retval.ToString();
} }
} }