B2017-180: don’t allow paste replace on source/enhanced steps.

B2017-181: fix crash when select/deselect procedure sets in search panel
This commit is contained in:
2017-08-24 13:55:34 +00:00
parent 79c7332829
commit 5ce26f2350
2 changed files with 16 additions and 4 deletions

View File

@@ -388,8 +388,18 @@ namespace Volian.Controls.Library
lstCheckedStepTypesStr.Clear();
topnode.Text = "Types";
advTreeStepTypes.Nodes.Add(topnode);
FormatData fmtdata = _MyDocVersion.ActiveFormat.PlantFormat.FormatData;
FormatData fmtdata = null;
// B2017-181: selecting/deselecting, and no nodes are selected was causing null reference when trying
// to access the DocVersion (none are selected), use the format off of the top folder:
if (_MyDocVersion == null)
{
FolderInfo fi = FolderInfo.Get(TopFolderID);
fmtdata = fi.ActiveFormat.PlantFormat.FormatData;
}
else
{
fmtdata = _MyDocVersion.ActiveFormat.PlantFormat.FormatData;
}
List<StepDataRetval> lstSrchStpTypes = fmtdata.GetSearchableSteps(); // list of searchable step types
if (lstSrchStpTypes != null && lstSrchStpTypes.Count > 0)
{